From 96735aca592d68a2d9f21997690d3bb7dc567107 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sat, 10 Mar 2018 09:50:08 -0500 Subject: [PATCH] =?UTF-8?q?hotfix=20sys.path=20bug=20@hynek=20found=20?= =?UTF-8?q?=E2=9C=A8=F0=9F=8D=B0=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pipenv/patched/piptools/repositories/pypi.py | 23 ++++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pipenv/patched/piptools/repositories/pypi.py b/pipenv/patched/piptools/repositories/pypi.py index a77b6502..1cbfa955 100755 --- a/pipenv/patched/piptools/repositories/pypi.py +++ b/pipenv/patched/piptools/repositories/pypi.py @@ -7,12 +7,12 @@ import os from contextlib import contextmanager from shutil import rmtree -from pip.download import is_file_url, url_to_path -from pip.index import PackageFinder -from pip.req.req_set import RequirementSet -from pip.wheel import Wheel +from pipenv.patched.pip.download import is_file_url, url_to_path +from pipenv.patched.pip.index import PackageFinder +from pipenv.patched.pip.req.req_set import RequirementSet +from pipenv.patched.pip.wheel import Wheel try: - from pip.utils.hashes import FAVORITE_HASH + from pipenv.patched.pip.utils.hashes import FAVORITE_HASH except ImportError: FAVORITE_HASH = 'sha256' @@ -171,10 +171,15 @@ class PyPIRepository(BaseRepository): json_raised = True json_results = set() + else: + json_raised = True + legacy_raised = False try: legacy_results = self.get_legacy_dependencies(ireq) - except Exception: + except Exception as e: + # TODO: don't do this. + raise(e) legacy_raised = True legacy_results = set() @@ -218,10 +223,14 @@ class PyPIRepository(BaseRepository): ignore_requires_python=True ) + import inspect + + # print(inspect.signature(reqset._prepare_file)) + # exit() result = reqset._prepare_file(self.finder, ireq, ignore_requires_python=True) if not result: if reqset.requires_python: - from pip.req.req_install import InstallRequirement + from ..pip.req.req_install import InstallRequirement marker = 'python_version=="{0}"'.format(reqset.requires_python.replace(' ', '')) new_req = InstallRequirement.from_line('{0}; {1}'.format(str(ireq.req), marker))