Commit Graph

4700 Commits

Author SHA1 Message Date
Dan Ryan cd47835100 Merge pull request #2479 from daogilvie/master
Explicit vendored click_completion *.j2 entry in MANIFEST.in
2018-06-30 20:17:15 -04:00
Dan Ryan fe0c21516d Merge branch 'master' into master 2018-06-30 20:17:04 -04:00
Dan Ryan 74b7a0907b Merge pull request #2480 from pypa/bugfix/2435-pkg-resources-typeerror
Update piptools to avoid reusing InstallRequirement
2018-06-30 20:16:49 -04:00
Dan Ryan 7dd8579d8e Fix typo
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-30 16:13:32 -04:00
Dan Ryan 5990f4224e Fix markers being dropped
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-30 15:49:32 -04:00
Dan Ryan 9566c7a798 Merge branch 'bugfix/2435-pkg-resources-typeerror' of github.com:pypa/pipenv into bugfix/2435-pkg-resources-typeerror 2018-06-30 02:49:43 -04:00
Dan Ryan a797691421 Remove old patches to piptools
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-30 02:49:29 -04:00
Tzu-ping Chung d5b91f13e7 Format 2018-06-30 13:46:56 +08:00
Dan Ryan cbbcc80170 I think this is good?
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 22:40:34 -04:00
Dan Ryan ad3aca8b24 Include all markers
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 22:00:06 -04:00
Dan Ryan 6e8586032a Move click-didyoumean.license
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 21:31:19 -04:00
Dan Ryan b9559951b6 Fix test failures
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 21:18:34 -04:00
Dan Ryan 7761c3d321 Fix patches
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 20:23:54 -04:00
Dan Ryan 1dfaceb7d9 Update piptools to avoid reusing InstallRequirement
- Prevents re-preparation of deleted `PKG-INFO` files
- Fixes #2435

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 19:20:11 -04:00
Dan Ryan 5072d1c057 Merge branch 'master' into master 2018-06-29 16:59:27 -04:00
Dan Ryan dbeb0de138 Merge branch 'master' of github.com:pypa/pipenv 2018-06-29 16:56:29 -04:00
Dan Ryan ca54b6d715 Merge pull request #2434 from pypa/appveyor_update
Test updates
2018-06-29 16:33:29 -04:00
Drum a27f48a39f Explicit vendored click_completion *.j2 entry in MANIFEST.in
This seems to be needed to make sure they are included in distributions.
2018-06-29 21:25:51 +01:00
Dan Ryan 3b8200054d Merge branch 'master' into appveyor_update 2018-06-29 15:47:23 -04:00
Erin O'Connell 0c58080e6b Merge pull request #2478 from pypa/feature/2477
Feature/2477
Change python -m pipenv.help to pipenv --support
2018-06-29 12:16:43 -06:00
Erin O'Connell 898b1e9346 Merge branch 'feature/2477' of github.com:pypa/pipenv into feature/2477 2018-06-29 11:37:20 -06:00
Erin O'Connell 1c2a6e2290 comment 2018-06-29 11:35:54 -06:00
Erin O'Connell 48970d901d new test for pipenv --support 2018-06-29 11:33:37 -06:00
Erin O'Connell 58ceb0ccd3 fix quotes for rst files 2018-06-29 11:32:51 -06:00
Tzu-ping Chung 7048bcb786 Update issue templates 2018-06-30 01:30:53 +08:00
Erin O'Connell 4cb677ac02 add news fragment for feature 2477 2018-06-29 10:47:49 -06:00
Erin O'Connell fa967853f5 added cli option for --support 2018-06-29 10:46:05 -06:00
Erin O'Connell 617ef44419 changed function name so it could be imported 2018-06-29 10:45:40 -06:00
Dan Ryan 4b8d9ffd33 Pass -y to pip uninstall for buildkite
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 12:45:14 -04:00
Dan Ryan 4bb3262c01 Merge pull request #2474 from greysteil/update-version-map
Update version map for latest Python releases
2018-06-29 11:47:45 -04:00
Grey Baker 9099f533f2 Update version map for latest Python releases 2018-06-29 09:18:26 -04:00
Dan Ryan c6fba403fe Merge branch 'master' into appveyor_update 2018-06-29 04:37:59 -04:00
Dan Ryan 8691c7168b Merge pull request #2371 from pypa/feature/repatch-shell-detection
Implement our own subshell logic
2018-06-29 04:36:53 -04:00
Tzu-ping Chung 1525e16d1a Actually inject path for fancy mode 2018-06-29 16:23:36 +08:00
Dan Ryan e2242bca61 Add news entries for shellingham
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 03:28:21 -04:00
Dan Ryan c5b2cf6c4f Fix pathlib fallback imports to use compat file
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 03:19:35 -04:00
Dan Ryan ec3b47ac3d Merge branch 'master' of github.com:pypa/pipenv
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 03:17:19 -04:00
Dan Ryan 8ab6008e9a Fix resolver imports
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-29 03:16:26 -04:00
Dan Ryan 79a2d8131c Merge branch 'master' into feature/repatch-shell-detection 2018-06-29 03:10:48 -04:00
Dan Ryan 65924fd05b Merge branch 'master' into appveyor_update 2018-06-29 03:10:31 -04:00
Dan Ryan 36c8957d20 Merge pull request #2430 from pypa/bugfix/1901
Updated piptools to only lock compatible packages
2018-06-29 03:09:43 -04:00
Dan Ryan 52095a9284 Stop importing unused things
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-28 22:01:10 -04:00
Dan Ryan 95e932e668 update buildkite
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-28 21:21:37 -04:00
Dan Ryan 511d0dd293 Fix buildkite
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-28 21:17:26 -04:00
Dan Ryan d82a98b4d3 Merge branch 'appveyor_update' of github.com:pypa/pipenv into appveyor_update 2018-06-28 20:51:31 -04:00
Dan Ryan a0f2d7ed5d Remove tox.ini
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-28 20:51:15 -04:00
Dan Ryan 6583eb969e Merge branch 'master' into appveyor_update 2018-06-28 20:50:37 -04:00
Dan Ryan 36e28c0370 Merge branch 'master' into feature/repatch-shell-detection 2018-06-28 20:50:18 -04:00
Dan Ryan 832bc8ee49 Merge branch 'master' into bugfix/1901 2018-06-28 20:46:23 -04:00
Dan Ryan 9d826c47bf Merge pull request #2466 from maxkrivich/fix-unicode-error
Fix `UnicodeEncodeError` in help.py
2018-06-28 20:44:27 -04:00