Import rewrites

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

pipenv/patched/piptools/cache.py

@@ -6,7 +6,7 @@
 import os
 import sys
 
-from pip._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

@@ -4,7 +4,7 @@
 from .click import secho
 from ._compat import user_cache_dir
 
-# The user_cache_dir helper comes straight from pip itself
+# The user_cache_dir helper comes straight from pipenv.patched.notpip itself
 CACHE_DIR = user_cache_dir('pip-tools')
 
 # NOTE

pipenv/patched/piptools/utils.py

@@ -12,9 +12,9 @@
 from ._compat import InstallRequirement
 
 from .click import style
-from pip._vendor.packaging.specifiers import SpecifierSet, InvalidSpecifier
-from pip._vendor.packaging.version import Version, InvalidVersion, parse as parse_version
-from pip._vendor.packaging.markers import Marker, Op, Value, Variable
+from pipenv.patched.notpip._vendor.packaging.specifiers import SpecifierSet, InvalidSpecifier
+from pipenv.patched.notpip._vendor.packaging.version import Version, InvalidVersion, parse as parse_version
+from pipenv.patched.notpip._vendor.packaging.markers import Marker, Op, Value, Variable
 
 
 UNSAFE_PACKAGES = {'setuptools', 'distribute', 'pip'}

pipenv/vendor/click/_unicodefun.py

@@ -114,5 +114,5 @@ def _verify_python3_env():
 
     raise RuntimeError('Click will abort further execution because Python 3 '
                        'was configured to use ASCII as encoding for the '
-                       'environment.  Consult http://click.pocoo.org/python3/ '
+                       'environment.  Consult http://click.pocoo.org/python3/'
                        'for mitigation steps.' + extra)

pipenv/vendor/requirementslib/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding=utf-8 -*-
-__version__ = '1.1.7.dev0'
+__version__ = '1.1.6'
 
 
 from .exceptions import RequirementError

pipenv/vendor/requirementslib/models/utils.py

@@ -117,7 +117,7 @@ def strip_ssh_from_git_uri(uri):
 
 
 def add_ssh_scheme_to_git_uri(uri):
-    """Cleans VCS uris from pip format"""
+    """Cleans VCS uris from pipenv.patched.notpip format"""
     if isinstance(uri, six.string_types):
         # Add scheme for parsing purposes, this is also what pip does
         if uri.startswith("git+") and "://" not in uri:

pipenv/vendor/yaspin/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Pavlo Dmytrenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.