Commit Graph

3979 Commits

Author SHA1 Message Date
Dan Ryan 573db7b017 Merge pull request #2015 from pypa/add-pipfile-env-test
Add pipfile env var expansion and test
2018-04-18 23:13:52 -04:00
Dan Ryan cda3283004 Merge branch 'master' into add-pipfile-env-test 2018-04-18 21:34:52 -04:00
Dan Ryan 1d5f870dde Merge pull request #2021 from bitwave/pre-dep-hint
fixes issue #2019
2018-04-18 21:34:21 -04:00
bitwave d863043295 fixes issue #2019 2018-04-18 19:51:11 +02:00
Tzu-ping Chung 09fb7d0a6f Merge pull request #2018 from eckardt/parse-pypy-version-string
Parse pypy3 version string containing multiple lines
2018-04-18 19:18:41 +08:00
Stephan Eckardt c35cb56d85 Parse pypy3 version string 2018-04-18 12:28:09 +02:00
Dan Ryan 3722d8a8cf Add pipfile env var expansion and test
- Fixes #1906

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-17 17:24:39 -04:00
Dan Ryan 3c675bd3b6 Merge pull request #1980 from pypa/1973-extra-index-urls
Add `--extra-index-url` from all extra indexes
2018-04-17 14:20:21 -04:00
Dan Ryan 88db0fe4ed Use startswith for url comparison in project
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-17 12:28:59 -04:00
Dan Ryan 31a4a75c98 Sort items before comparison
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-17 01:52:16 -04:00
Dan Ryan 7a8d01edc3 Fix tests and index url fetching code per requests
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-17 01:16:49 -04:00
Dan Ryan c2462e3b23 Refactor split_index and split_extra_index
- Interpolate environment vars into pipfile sources
- Use first to more efficiently handle list comprehensions

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-17 00:33:42 -04:00
Dan Ryan b89a73c895 Update tests
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:55:46 -04:00
Dan Ryan 81a2367e75 Run private indexes in uncached tests
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:05 -04:00
Dan Ryan 8d20caf294 Update test pypi index
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:04 -04:00
Dan Ryan c78628ba54 Add test coverage for all fixes
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:04 -04:00
Dan Ryan f93b9f2428 Add tests for project source changes
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:04 -04:00
Dan Ryan e8efe3fd72 Add encoding to jenkins test runner
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:04 -04:00
Cody 1a64a8d456 clarify wording on some envars 2018-04-16 23:15:04 -04:00
Cody f91facd99f add section explaining PIPENV_VENV_IN_PROJECT 2018-04-16 23:15:03 -04:00
Cody fa299dbbb7 add more envars to docs 2018-04-16 23:15:03 -04:00
Dan Ryan 34d34aea23 Handle indexes, extra indexes, uncached sources
- Handle extra-index-urls when resolving
- Handle extra-index-url when using `--skip-lock`
- Parse index arguments when installing individual packages
- Translate index aliases to urls
- Always include extra indexes when installing a packages
- `get_source()` falls back to `parsed_pipfile['source']` for sources when
   not present in the lockfile (#1994)
- Include index and extra-index-url arguments in `pipenv lock -r` output
- Fixes #1973, #1974, #1852, #1977, #1994

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:03 -04:00
Cody 8401accbbb add PIPENV_INSTALL_TIMEOUT to envar index
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:03 -04:00
Dan Ryan 2000f47281 Check for sources in pipfile before validating
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:15:03 -04:00
Dan Ryan e054d77254 Add --extra-index-url from all extra indexes
- Always add extra indexes when installing
- Look up indexes by key if key is given instead of url
- Fixes #1973, #1974, #1852

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 23:14:59 -04:00
Dan Ryan 248c2132ba Merge pull request #1917 from immerrr/make-costly-imports-lazy
Make costly imports lazy to optimize startup time
2018-04-16 23:14:02 -04:00
Dan Ryan 8705147674 Fix installation test
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 20:59:23 -04:00
Dan Ryan 76119a2301 Make imports even lazier
- Cuts normal load times in half

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 20:41:40 -04:00
immerrr 7ff884887c Make costly imports lazy to optimize startup time 2018-04-16 20:41:35 -04:00
Dan Ryan 4f52dc85f3 Merge pull request #1982 from pypa/purge-rfc3339-timestamp
Purge strict-rfc3339 and timestamp from prettytoml
2018-04-16 20:26:24 -04:00
Dan Ryan 6439d3a20f Merge branch 'master' into purge-rfc3339-timestamp 2018-04-16 20:26:16 -04:00
Dan Ryan cd4086f50c Merge pull request #1983 from frostming/consistent-name
Unify the references to Pipenv in doc
2018-04-16 20:08:02 -04:00
Dan Ryan f5d2f24fc5 Merge branch 'purge-rfc3339-timestamp' of github.com:pypa/pipenv into purge-rfc3339-timestamp
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 19:54:53 -04:00
Dan Ryan e0685d2959 Merge branch 'master' into consistent-name 2018-04-16 19:34:04 -04:00
Dan Ryan 72524168c8 Merge pull request #2006 from bryant1410/patch-2
Add missing 'deploy' param in do_init call

- Fixes #1991
2018-04-16 19:31:02 -04:00
Dan Ryan eaed181148 Update lockfile to include win32 deps
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 19:25:16 -04:00
Dan Ryan a9a0cf550b Merge branch 'master' into purge-rfc3339-timestamp 2018-04-16 19:18:24 -04:00
Dan Ryan e26670ad14 Merge branch 'master' into patch-2 2018-04-16 19:12:33 -04:00
Dan Ryan 502921c264 Merge pull request #2005 from pypa/vendor-update
Vendor update
- Fixes #1996
2018-04-16 19:12:11 -04:00
Dan Ryan 06525a8018 Formatting updates
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 17:45:14 -04:00
Dan Ryan c6c3272c57 Update lockfile
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 17:17:47 -04:00
Dan Ryan a826a6a4cc Fix vendoring tasks and always use pip9 for now
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 16:52:43 -04:00
Dan Ryan 2e11b7a360 update safety.zip
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 15:27:45 -04:00
Santiago Castro d631c92f21 Add missing 'deploy' param in do_init call 2018-04-16 15:51:10 -03:00
Dan Ryan 3d90591355 Update safety.zip, add automation for future
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-16 13:23:32 -04:00
Tzu-ping Chung 6bfa525fd3 Add tests for prettytoml datetime 2018-04-16 15:30:00 +08:00
Dan Ryan 27380c7cb7 Add vendoring tools to get licenses and safety zip
- Auto-download licenses and safety zips
- Update safety.zip

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-15 21:53:46 -04:00
Dan Ryan 76dbc0fb09 Initial commit of vendoring tools
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-14 21:54:17 -04:00
Frost Ming 336f649e13 revise as suggested 2018-04-14 16:20:23 +08:00
frostming ea06c18565 change the term of conda 2018-04-14 16:17:26 +08:00