fix #1667 i think

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

pipenv/patched/notpip/index.py

@@ -22,7 +22,7 @@ from pip.utils import (
 )
 from pip.utils.deprecation import RemovedInPip10Warning
 from pip.utils.logging import indent_log
-from pip.utils.packaging import check_requires_python
+from notpip.utils.packaging import check_requires_python
 from pip.exceptions import (
     DistributionNotFound, BestVersionAlreadyInstalled, InvalidWheelFilename,
     UnsupportedWheel,
@@ -30,7 +30,7 @@ from pip.exceptions import (
 from pip.download import HAS_TLS, is_url, path_to_url, url_to_path
 from pip.wheel import Wheel, wheel_ext
 from pip.pep425tags import get_supported
-from pip._vendor import html5lib, requests, six
+from notpip._vendor import html5lib, requests, six
 from pip._vendor.packaging.version import parse as parse_version
 from pip._vendor.packaging.utils import canonicalize_name
 from pip._vendor.packaging import specifiers

pipenv/patched/notpip/req/req_install.py

@@ -14,9 +14,9 @@ from distutils import sysconfig
 from distutils.util import change_root
 from email.parser import FeedParser
 
-from pip._vendor import pkg_resources, six
-from pip._vendor.packaging import specifiers
-from pip._vendor.packaging.markers import Marker
+from notpip._vendor import pkg_resources, six
+from notpip._vendor.packaging import specifiers
+from notpip._vendor.packaging.markers import Marker
 from pip._vendor.packaging.requirements import InvalidRequirement, Requirement
 from pip._vendor.packaging.utils import canonicalize_name
 from pip._vendor.packaging.version import Version, parse as parse_version

pipenv/patched/notpip/req/req_set.py

@@ -16,7 +16,7 @@ from pip.exceptions import (InstallationError, BestVersionAlreadyInstalled,
                             HashError, HashErrors, HashUnpinned,
                             DirectoryUrlHashUnsupported, VcsHashUnsupported,
                             UnsupportedPythonVersion)
-from pip.req.req_install import InstallRequirement
+from notpip.req.req_install import InstallRequirement
 from pip.utils import (
     display_path, dist_in_usersite, ensure_dir, normalize_path)
 from pip.utils.hashes import MissingHashes

pipenv/utils.py

@@ -443,7 +443,6 @@ def resolve_deps(deps, which, project, sources=None, verbose=False, python=False
                         click.echo('{0}: Error generating hash for {1}'.format(crayons.red('Warning', bold=True), name))
 
             # Collect un-collectable hashes (should work with devpi).
-
             try:
                 collected_hashes = collected_hashes + list(list(resolver.resolve_hashes([result]).items())[0][1])
             except (ValueError, KeyError, ConnectionError, IndexError):