Only strip VCS prefix for URIs with vcs+ patterns #1128
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
- Fixes pypa#1126 - Does a simple check before stripping the VCS prefix on a requirement.uri in pipenv.utils.convert_deps_from_pip
nateprewitt
requested changes
Nov 27, 2017
There was a problem hiding this comment.
Alright looks like we're almost there, left a few notes to address. Thanks @techalchemy!
pipenv/utils.py
Outdated
| @@ -45,7 +45,7 @@ | |||
|
|
|||
| # List of version control systems we support. | |||
| VCS_LIST = ('git', 'svn', 'hg', 'bzr') | |||
| SCHEME_LIST = ('http://', 'https://', 'ftp://', 'file://') | |||
There was a problem hiding this comment.
Why is this getting added to the scheme list?
There was a problem hiding this comment.
erm, it shouldn't be necessary, sorry for the sloppy PR that was my early hope that just adding it to the scheme list would pick it up in the logic
pipenv/utils.py
Outdated
| @@ -661,8 +661,10 @@ def convert_deps_from_pip(dep): | |||
| req.path = None | |||
|
|
|||
| # Crop off the git+, etc part. | |||
| dependency.setdefault(req.name, {}).update({req.vcs: req.uri[len(req.vcs) + 1:]}) | |||
|
|
|||
| if '+' in req.uri: | |||
There was a problem hiding this comment.
So I don't know if the + check by itself will be sufficient. That's a legal character in the path as well. We need to determine if there's a + explicitly in the scheme.
pipenv/utils.py
Outdated
| if '+' in req.uri: | ||
| req.uri = req.uri[len(req.vcs) + 1:] | ||
| dependency.setdefault(req.name, {}).update({req.vcs: req.uri}) | ||
| print('dependency: {}'.format(dependency)) |
3e747b4 to
ce01575
Compare
- Only remove 'vcs+' pattern from URI in convert_deps_from_pip if the requirement uri explicitly begins with requirement.vcs+
ce01575 to
de02f53
Compare
nateprewitt
approved these changes
Nov 27, 2017
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.
a
requirement.uriinpipenv.utils.convert_deps_from_pip