Fix recursive PEP 508 VCS resolution #4241
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
techalchemy
requested review from
frostming and
uranusjr
and removed request for
frostming
techalchemy
added
Category: Dependency Resolution
uranusjr
reviewed
May 5, 2020
| @@ -181,6 +181,8 @@ def format_requirement(ireq, marker=None, hashes=None): | |||
| """ | |||
| if ireq.editable: | |||
| line = "-e {}".format(ireq.link.url) | |||
| elif ireq.link and ireq.link.is_vcs: | |||
| line = str(ireq.req) | |||
There was a problem hiding this comment.
Should we surface this problem to upstream? or is this issue specific to pipenv.
There was a problem hiding this comment.
I think this is specific to pipenv -- or possibly it is now fixed in piptools, since piptools captures and caches the vcs dependency correctly now
uranusjr
reviewed
May 5, 2020
pipenv/utils.py
Outdated
| @@ -760,7 +764,7 @@ def repository(self): | |||
| from pipenv.patched.piptools.repositories.pypi import PyPIRepository | |||
| self._repository = PyPIRepository( | |||
| self.pip_args, use_json=False, session=self.session, | |||
| build_isolation=self.pip_options.build_isolation | |||
| build_isolation=False | |||
There was a problem hiding this comment.
oh hrm, no... I can't even remember why I did this now
- Recursively resolve PEP 508 URLs in subdependencies - Fix `piptools` cache storage of VCS dependencies as results - Avoid saving VCS dependency versions to `Pipfile.lock` - Fixes #3396 - Fixes #4217 Signed-off-by: Dan Ryan <[email protected]>
frostming
approved these changes
May 6, 2020
Signed-off-by: Dan Ryan <[email protected]>
30 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
piptoolscache storage of VCS dependencies as resultsPipfile.lockSigned-off-by: Dan Ryan [email protected]