Commit Graph

4109 Commits

Author SHA1 Message Date
Tzu-ping Chung fb9fb2e575 Simplify JSON dump compatibility code 2018-05-04 01:08:45 +08:00
Dan Ryan d26e16a539 Read in universal newline mode
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 12:08:59 -04:00
Dan Ryan a075445367 Updated versions
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 11:59:55 -04:00
Dan Ryan 5718ae8f42 Fix newline tests for windows
- Adjust for proper parameterization

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 03:27:45 -04:00
Dan Ryan 415566f5d6 Update newline check
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-02 22:40:38 -04:00
Dan Ryan 76827408ad Fix edge case of existing but empty lockfiles
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-02 21:36:46 -04:00
Dan Ryan 18704a5e21 Update newline tests 2018-05-02 20:49:52 -04:00
Dan Ryan 6d24b2be68 Merge branch 'master' into 1847-newlines 2018-05-02 19:02:36 -04:00
Dan Ryan 77a04cf7e7 Python 2 NamedTemporaryFile bugfix
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-02 19:01:47 -04:00
Dan Ryan e3d7dbc346 Merge branch 'master' into 1847-newlines 2018-05-02 18:22:47 -04:00
Dan Ryan 84b8f87f3a Merge pull request #2119 from pypa/prettytoml-table-is-mapping
Implement __iter__ to make AbstractTable a mapping
2018-05-02 18:22:05 -04:00
Kyle Altendorf 0aeee15c29 Merge branch 'master' into 1847-newlines 2018-05-02 09:23:02 -04:00
Tzu-ping Chung c9f74d7e1e Implement __iter__ to make AbstractTable a mapping
This supplements #2101 and makes the check more idiomatic.
2018-05-02 19:33:34 +08:00
Tzu-ping Chung 47e3447012 Merge pull request #2118 from frostming/outdated_norm_name
Normalize name when checking outdated packages
2018-05-02 19:33:14 +08:00
Tzu-ping Chung 8b47947d52 Merge branch 'master' into outdated_norm_name 2018-05-02 18:07:50 +08:00
Tzu-ping Chung 8237544889 Merge pull request #2112 from joshfriend/patch-2
Update 2.7 default to 2.7.15
2018-05-02 18:06:46 +08:00
Tzu-ping Chung af2ae5e1eb Merge branch 'master' into patch-2 2018-05-02 17:48:33 +08:00
Tzu-ping Chung b6cd407c76 Merge pull request #2109 from greysteil/fix-warning-typo
Fix whitespace in resolution failure hint
2018-05-02 17:48:14 +08:00
Tzu-ping Chung 37018ccc71 Merge branch 'master' into fix-warning-typo 2018-05-02 17:40:14 +08:00
Tzu-ping Chung 5676e8cc9f Merge pull request #2052 from SmileyChris/speed-up-lock
Speed up lock by removing redundant freeze
2018-05-02 17:39:38 +08:00
Tzu-ping Chung 23f80877a5 Merge branch 'master' into speed-up-lock 2018-05-02 17:29:49 +08:00
Tzu-ping Chung f66ebbdcbe Merge pull request #2111 from greysteil/always-use-pipfile-for-sources
Always use sources from Pipfile when doing resolution
2018-05-02 17:29:02 +08:00
Tzu-ping Chung 2dc999292e Use the mock PyPI 2018-05-02 17:07:49 +08:00
Tzu-ping Chung 7aff2c1cc7 Merge branch 'master' into always-use-pipfile-for-sources 2018-05-02 16:58:59 +08:00
Tzu-ping Chung 125138684b Merge pull request #2104 from pypa/feature/backport-namedtemporaryfile
Backport `NamedTemporaryFile` for `io.open` support
2018-05-02 16:58:43 +08:00
Tzu-ping Chung 95643e9007 Merge branch 'master' into feature/backport-namedtemporaryfile 2018-05-02 16:46:30 +08:00
Tzu-ping Chung 03fe528404 Merge pull request #2101 from greysteil/check-pin-for-inline-tables
Check whether inline tables are pinned during pipenv lock --keep-outdated flow
2018-05-02 16:46:20 +08:00
Tzu-ping Chung 64419712b9 Merge branch 'master' into check-pin-for-inline-tables 2018-05-02 16:36:23 +08:00
Dan Ryan 0fa9e17cd1 Merge pull request #2094 from hroncok/4th-licenses
Add licenses for 4th party libs (vendored in pip)
2018-05-02 02:22:29 -04:00
frostming 6b472ef742 Normalize name when checking outdated packages 2018-05-02 11:54:17 +08:00
Josh Friend 51c47b3097 Update 2.7 default to 2.7.15
https://mail.python.org/pipermail/python-list/2018-May/732755.html
2018-05-01 10:59:54 -04:00
Grey Baker 8c0936faf6 Always use sources from Pipfile when doing resolution 2018-05-01 15:14:12 +01:00
Grey Baker 4a3591747b Fix whitespace in resolution failure hint 2018-05-01 13:49:38 +01:00
Grey Baker 85d4734e12 Add test for lock --keep-outdated behaviour 2018-05-01 11:34:46 +01:00
Grey Baker 1bb75dce41 Check whether inline tables are pinned during pipenv lock --keep-outdated flow 2018-05-01 10:04:46 +01:00
Dan Ryan 528f061d85 Open temporary files in binary mode on python 2
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-30 23:54:32 -04:00
Dan Ryan 34caffc797 Backport NamedTemporaryFile for io.open support
- Allows atomic locking to use `newline` argument

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-30 23:35:58 -04:00
Miro Hrončok 70fd366a11 Add licenses for 4th party libs (vendored in pip)
Used the following:

(modified from https://github.com/pypa/pip/blob/9.0.3/pip/_vendor/vendor.txt)

setuptools==39.1.0
appdirs==1.4.0
distlib==0.2.4
distro==1.0.1
html5lib==1.0b10
six==1.10.0
colorama==0.3.7
requests==2.11.1
    chardet==3.0.4
    idna==2.6
    urllib3==1.22
    certifi==2018.1.18
CacheControl==0.11.7
lockfile==0.12.2
ordereddict==1.1
progress==1.2
ipaddress==1.0.17
packaging==16.8
pyparsing==2.1.10
retrying==1.3.3
webencodings==0.5

And the vendoring script from https://github.com/pypa/pip/pull/5213

Fixes https://github.com/pypa/pipenv/issues/1961
2018-04-30 11:24:27 +02:00
Dan Ryan 0e239e0d2f Merge branch 'master' into speed-up-lock 2018-04-30 02:21:15 -04:00
Dan Ryan a16b1d0651 Merge pull request #2091 from pypa/bugfix/2078-allow-locking-in-virtualenv
Make sure we are not in a virtualenv if aborting
2018-04-30 02:20:53 -04:00
Dan Ryan e8a8ac428f Make sure we are not in a virtualenv if aborting
- Fixes #2078

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-30 00:12:55 -04:00
Dan Ryan 9fc45b140c Merge pull request #2081 from tveastman/master
Suggest pip as the first recommended installation method instead of Homebrew
2018-04-29 22:36:20 -04:00
Dan Ryan b8acd15365 Merge branch 'master' into master 2018-04-29 22:36:13 -04:00
Dan Ryan 283cc48331 Merge pull request #2080 from greysteil/allow-pyenv-installs-in-non-interactive-sessions
Allow pyenv installs in non-interactive sessions in PIPENV_YES is set
2018-04-29 22:35:35 -04:00
Dan Ryan 11e0e5cb49 Merge branch 'master' into allow-pyenv-installs-in-non-interactive-sessions 2018-04-29 22:35:21 -04:00
Dan Ryan 2a3a834049 Merge pull request #2030 from zejn/master
Fix progress.py to obey PIPENV_COLORBLIND and not use any colors.
2018-04-29 22:29:28 -04:00
Dan Ryan da79f533bd Merge branch 'master' into master 2018-04-29 15:45:29 -04:00
Dan Ryan 1967dddfba Merge pull request #1998 from sfermigier/patch-2
I believe this tox config is more correct this way
2018-04-29 15:44:58 -04:00
Dan Ryan 88380f4241 Merge branch 'master' into patch-2 2018-04-29 15:44:48 -04:00
Dan Ryan f0d63b2250 Merge pull request #2077 from pypa/atomic-lockfile-overwrite
Atomic lockfile overwrite
2018-04-29 15:44:19 -04:00