diff --git a/pipenv/patched/piptools/cache.py b/pipenv/patched/piptools/cache.py index afdecd23..610a4f37 100644 --- a/pipenv/patched/piptools/cache.py +++ b/pipenv/patched/piptools/cache.py @@ -6,7 +6,7 @@ import json import os import sys -from notpip._vendor.packaging.requirements import Requirement +from pipenv.patched.notpip._vendor.packaging.requirements import Requirement from .exceptions import PipToolsError from .locations import CACHE_DIR diff --git a/pipenv/patched/piptools/locations.py b/pipenv/patched/piptools/locations.py index 4458f3cb..fbc820ab 100644 --- a/pipenv/patched/piptools/locations.py +++ b/pipenv/patched/piptools/locations.py @@ -6,7 +6,7 @@ from .click import secho # from ._compat import user_cache_dir from pipenv.environments import PIPENV_CACHE_DIR -# The user_cache_dir helper comes straight from notpip itself +# The user_cache_dir helper comes straight from pipenv.patched.notpip itself # CACHE_DIR = user_cache_dir(os.path.join('pip-tools')) CACHE_DIR = PIPENV_CACHE_DIR diff --git a/pipenv/patched/piptools/resolver.py b/pipenv/patched/piptools/resolver.py index af82b0cc..79343cbb 100644 --- a/pipenv/patched/piptools/resolver.py +++ b/pipenv/patched/piptools/resolver.py @@ -148,11 +148,9 @@ class Resolver(object): if editable_ireq: yield editable_ireq # ignore all the other specs: the editable one is the one that counts continue - ireqs = iter(ireqs) # deepcopy the accumulator so as to not modify the self.our_constraints invariant combined_ireq = copy.deepcopy(next(ireqs)) - combined_ireq.comes_from = None for ireq in ireqs: # NOTE we may be losing some info on dropped reqs here combined_ireq.req.specifier &= ireq.req.specifier