Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix git+ssh url parsing for requirements #1572

Merged
merged 1 commit into from
Mar 6, 2018
Merged

Fix git+ssh url parsing for requirements #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pipenv/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@ def pip_install(

# Install dependencies when a package is a VCS dependency.
try:
req = get_requirement(package_name.split('--hash')[0].split('--trusted-host')[0]).vcs
req = get_requirement(package_name.split('--hash')[0].split('--trusted-host')[0], verbose=verbose).vcs
except (pip._vendor.pyparsing.ParseException, ValueError) as e:
click.echo('{0}: {1}'.format(crayons.red('WARNING'), e), err=True)
click.echo(
Expand Down Expand Up @@ -2428,7 +2428,7 @@ def do_clean(

installed_package_names = []
for installed in installed_packages:
r = get_requirement(installed)
r = get_requirement(installed, verbose=verbose)

# Ignore editable installations.
if not r.editable:
Expand Down
5 changes: 3 additions & 2 deletions pipenv/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
from piptools.resolver import Resolver
from piptools.repositories.pypi import PyPIRepository
from piptools.scripts.compile import get_pip_command
from piptools import logging
from piptools import logging as piptools_logging
from piptools.exceptions import NoCandidateFound
from pip.download import is_archive_file
from pip.exceptions import DistributionNotFound
Expand Down Expand Up @@ -140,7 +140,7 @@ def get_requirement(dep):
elif req.local_file and path and not req.vcs:
req.path = path
req.uri = None
elif req.vcs and req.uri and cleaned_uri and uri != req.uri:
elif req.vcs and req.uri and cleaned_uri and cleaned_uri != uri:
req.uri = strip_ssh_from_git_uri(req.uri)
req.line = strip_ssh_from_git_uri(req.line)
req.editable = editable
Expand Down Expand Up @@ -314,6 +314,7 @@ class PipCommand(pip.basecommand.Command):

if verbose:
logging.log.verbose = True
piptools_logging.log.verbose = True


resolved_tree = set()
Expand Down