Update vendored piptools

Signed-off-by: Dan Ryan <dan@danryan.co>

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

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
 

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