Commit Graph

4462 Commits

Author SHA1 Message Date
Dan Ryan bc5a50dec7 Update naming to convey meaning more clearly
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 23:16:08 -04:00
Tzu-ping Chung 2d302b943f Clean up some dict retrieval code
I *think* the previous code could get an exception in certain edge cases?
I don't know, but this looks more straightforward and safer.
2018-06-15 08:34:14 +08:00
Dan Ryan 4dbab47f11 Protect against NoneTypes
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Dan Ryan 87475c2abb Split ref from relative path in vcs ref
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Dan Ryan 7f920076ac Fix parse bug
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Dan Ryan 5dc77a9419 Fix duplicate import
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Dan Ryan 1c054c3701 Fix VCRPy test
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Dan Ryan 7bfa60e90b Add test
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Dan Ryan a5c876b931 Add ref to vcs install
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Dan Ryan 18530dfb46 Fix VCS resolution
- Iterate over VCS dependencies from pipfile instead of
  iterating over those found in `pip freeze` output
- Only pass editable dependencies to pip-tools for resolution
- Normalize names and ensure that we update lockfile entries accordingly

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-14 03:58:49 -04:00
Tzu-ping Chung 4b95004f1a Merge pull request #2312 from pypa/pipenv-run-in-hint
Hint “pipenv run” after creating the virtualenv
2018-06-14 13:59:40 +08:00
Dan Ryan 3c2c2953ca Merge branch 'master' into pipenv-run-in-hint 2018-06-14 00:30:21 -04:00
Dan Ryan 42f9c0287f Merge pull request #2350 from pypa/bugfix/skip_requirements-gh-2349
Ensure skip_requirements is set before use
2018-06-14 00:28:23 -04:00
Dan Ryan 3204bf2a8c Merge branch 'master' into bugfix/skip_requirements-gh-2349 2018-06-14 00:27:51 -04:00
Dan Ryan 403aa9d893 Merge pull request #2331 from pypa/unc-paths
added support for mounted drives via unc paths.
2018-06-14 00:27:33 -04:00
Erin O'Connell e478ce1af8 Merge branch 'master' into unc-paths 2018-06-13 21:19:24 -06:00
Erin O'Connell 9fe0810379 implement new logic for handling ramdisk's 2018-06-13 21:17:31 -06:00
Dan Ryan a27a34a618 Merge branch 'master' into bugfix/skip_requirements-gh-2349 2018-06-13 23:10:11 -04:00
Dan Ryan 9968170499 Merge pull request #2345 from pypa/bugfix/windows-requirements-paths
Bugfix/windows requirements paths
2018-06-13 23:07:31 -04:00
Dan Ryan 5ba0a1feb7 Update requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-13 21:45:43 -04:00
Dan Ryan 6a0a34b415 Fix uri conversion
Signed-off-by: Dan Ryan <dan.ryan@xyleminc.com>
2018-06-13 19:41:15 -04:00
Dan Ryan bca3e1fa61 fix tests
Signed-off-by: Dan Ryan <dan.ryan@xyleminc.com>
2018-06-13 19:34:41 -04:00
Dan Ryan 18f6e94602 Fix iterator that i broke for reasons
Signed-off-by: Dan Ryan <dan.ryan@xyleminc.com>
2018-06-13 19:26:16 -04:00
Dan Ryan 126b7444c6 Check if setup_path exists
Signed-off-by: Dan Ryan <dan.ryan@xyleminc.com>
2018-06-13 19:18:34 -04:00
Dan Ryan 470abeffde Update resolve() calls and requirementslib
- Accommodate ramdisks

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-13 18:59:43 -04:00
Dan Ryan 463cf778cf Merge branch 'bugfix/windows-requirements-paths' of github.com:pypa/pipenv into bugfix/windows-requirements-paths 2018-06-13 18:54:20 -04:00
Tzu-ping Chung 4e4dfe2afa Clean up URL quote-unquote logic 2018-06-14 01:35:13 +08:00
Tzu-ping Chung ba23f5c819 Cherry-pick requirementslib@dae7cb2 2018-06-14 01:10:13 +08:00
Dan Ryan 1e99d0d132 Merge branch 'bugfix/windows-requirements-paths' of github.com:pypa/pipenv into bugfix/windows-requirements-paths 2018-06-13 11:49:35 -04:00
Dan Ryan ca05f2f3d6 Test fix and merge
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-13 11:49:17 -04:00
Tzu-ping Chung c781e55aa6 Apply patch from requirementslib upstream 2018-06-13 22:54:25 +08:00
Tzu-ping Chung 250ba9c36f Make use of relpath 2018-06-13 20:39:50 +08:00
Tzu-ping Chung c7568ebd58 Apply sarugaku/requirementslib#8 2018-06-13 20:05:29 +08:00
Dan Ryan ff134497b1 Fixes for windows paths, parsing
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-13 01:00:55 -04:00
Dan Ryan 15f091783b Fix VCS test
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 20:33:25 -04:00
Dan Ryan e376deea0d Requirementslib fixes
- Fixes #2344

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 19:41:27 -04:00
Dan Ryan 1525daea73 Parse windows paths and git repositories correctly
- Fix a bug affecting VCS repositories on all platforms not being
  turned into requirements correctly for handoff to piptools / pip
- Fix a bug with parsing paths on windows which caused us to mix
  posix-style and windows-style formatting in relative paths as well as
  cut off drives in certain circumstances

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 16:10:48 -04:00
Tzu-ping Chung e5ec2ed4fa More tests 2018-06-13 01:06:07 +08:00
Tzu-ping Chung 45004214bf Add failing test cases 2018-06-13 00:34:41 +08:00
Tzu-ping Chung 3b550d4c4f Ensure skip_requirements is set before use 2018-06-12 23:52:52 +08:00
Dan Ryan 9e04a85b8c I have fixed the test.
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 03:38:26 -04:00
Dan Ryan caf09662d6 Use constraint lines to update requirements
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 03:05:01 -04:00
Dan Ryan 50be8c31fa Cleanup resolver imports
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 02:43:21 -04:00
Dan Ryan d519718e55 Improved named requirement handling
- Use requirement.requirement.line objects when generating constraints
  for pip

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 23:49:57 -04:00
Tzu-ping Chung fcc4dc5f4d Hint "pipenv run" after creating the virtualenv
Also some refactoring to remove dead code and misleading function name.
2018-06-12 08:57:16 +08:00
Erin O'Connell 0f59c74ac0 try except for first time run of lock 2018-06-11 18:30:04 -06:00
Erin O'Connell 4281eb76e2 Merge branch 'master' into unc-paths 2018-06-11 17:07:36 -06:00
Dan Ryan 863ebbd89e Merge pull request #2287 from skurfer/shell-history
Cleaner shell history
2018-06-11 17:35:47 -04:00
Dan Ryan 487d58adcf Merge branch 'master' into shell-history 2018-06-11 13:03:28 -04:00
Dan Ryan 7c8f574f89 Merge branch 'master' into unc-paths 2018-06-11 13:02:39 -04:00