Commit Graph

4132 Commits

Author SHA1 Message Date
Grey Baker 1414243c01 Retry pypi.org requests on CI, or if an environment variable is set
Use PIPENV_MAX_RETRIES environment variable to determine how many times to retry
requests to pypi.org. Default to 0 retries, unless running on CI, in which case
default to 1 retry.
2018-05-05 19:15:02 +01:00
Dan Ryan cbe15167c2 Merge pull request #2141 from pypa/bugfix/2100-do-not-extrapolate-in-lock
Do not expand environ in cache on package install
2018-05-04 15:40:32 -04:00
Tzu-ping Chung 0984bab787 Do not expand environ in cache on package install
Fix #2100.
2018-05-05 01:04:36 +08:00
Dan Ryan 10cb623dc0 Merge pull request #2135 from pypa/bugfix/1997-extras-from-url
Parse and include extras from vcs and non-vcs urls
2018-05-03 23:02:49 -04:00
Dan Ryan f0c33367fa Parse and include extras from vcs and non-vcs urls
- Include extras when rebuilding urls from pipfiles
- Fixes #1997, #2128

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 22:43:30 -04:00
Dan Ryan 69526d0f93 Merge pull request #2126 from pypa/feature/update-vendoring
Update vendoring script and patches
2018-05-03 20:56:10 -04:00
Dan Ryan 5f047b5f5f Patches need to have 1 whitespace on empty lines
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 20:18:16 -04:00
Dan Ryan 992645ead0 Update licenses
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 20:18:16 -04:00
Dan Ryan 17888fb131 Auto-download pip licenses
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 20:18:16 -04:00
Dan Ryan af0150b07e Update vendoring patches
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 20:18:16 -04:00
Dan Ryan 962ce7b065 Merge pull request #2131 from pypa/sync-shouldnt-lock
Check lockfile exists on sync, and don't update it
2018-05-03 20:18:04 -04:00
Tzu-ping Chung d21efa08c7 Check lockfile exists on sync, and don't update it
Matching the behaviour mentioned in:
https://github.com/pypa/pipenv/issues/1463#issuecomment-386297896
2018-05-03 19:18:45 -04:00
Dan Ryan f6d23ce35e Merge pull request #2069 from altendky/1847-newlines
Default to \n, retain consistent \r\n
2018-05-03 19:16:12 -04:00
Dan Ryan 7e32d26e62 Update pathlib import, drop extra io.open arg
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-03 18:49:17 -04:00
Kyle Altendorf e4270dc292 Merge remote-tracking branch 'upstream/1847-newlines' into 1847-newlines 2018-05-03 12:20:59 -07:00
Kyle Altendorf 6bac97c50b Always os.open() with os.O_BINARY() for NamedTemporaryFile 2018-05-03 11:59:14 -07:00
Tzu-ping Chung 116ce7191d Better test errors and remove useless newline='' 2018-05-04 02:39:53 +08:00
Tzu-ping Chung acdd2ff126 Test for '\n', not platform newlines in user code
Python always generates '\n' in string (unless we explicitly specify
otherwise), so we should test that. Leave line ending handling to library
code.
2018-05-04 02:37:28 +08:00
Tzu-ping Chung 0c35920406 Always use binary mode in NamedTempoeraryFile
Text mode would enable auto line ending translation, but we want to handle
them ourselves (in io.open) instead. This would not affect the ability to
write text files (io.open does the right thing as long as we give it the
correct mode).
2018-05-04 02:34:48 +08:00
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
Kyle Altendorf 2ca94fb010 normpath(abspath()) for path comparison 2018-05-03 08:50:08 -07:00
Kyle Altendorf ab63176851 Add message to newline assertions
Compensating for https://github.com/pytest-dev/pytest/issues/3443
2018-05-03 08:45:44 -07:00
Kyle Altendorf 536d6febc3 Revert "Update newline tests"
This reverts commit 18704a5e21.
2018-05-03 08:38:33 -07:00
Kyle Altendorf 8a25696528 Revert "Update newline check"
This reverts commit 415566f5d6.
2018-05-03 08:38:25 -07: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