Merge pull request #2368 from pypa/update-vendored-deps

Update vendored deps
pypa · Jun 17, 2018 · 13ecf31 · 13ecf31
2 parents 7ccbc2c + 040ae11
commit 13ecf31
Show file tree

Hide file tree

Showing 129 changed files with 5,436 additions and 2,208 deletions.
diff --git a/Pipfile b/Pipfile
@@ -12,8 +12,9 @@ pytest-pypy = {path = "./tests/pytest-pypi", editable = true}
 pytest-tap = "*"
 flaky = "*"
 stdeb = {version="*", markers="sys_platform == 'linux'"}
-white = {version="*", markers="python_version >= '3.6'"}
+black = {version="*", markers="python_version >= '3.6'"}
 pytz = "*"
+towncrier = "*"
 
 [packages]
 

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pipenv/patched/piptools/_compat/pip_compat.py b/pipenv/patched/piptools/_compat/pip_compat.py
@@ -22,7 +22,7 @@ def do_import(module_path, subimport=None, old_path=None, vendored_name=None):
     if subimport:
         return getattr(_tmp, subimport, _tmp)
     return _tmp
-    
+
 
 InstallRequirement = do_import('req.req_install', 'InstallRequirement', vendored_name='notpip')
 parse_requirements = do_import('req.req_file', 'parse_requirements', vendored_name='notpip')

diff --git a/pipenv/patched/piptools/repositories/pypi.py b/pipenv/patched/piptools/repositories/pypi.py
@@ -22,10 +22,10 @@
     InstallationError,
 )
 
-from notpip._vendor.packaging.requirements import InvalidRequirement, Requirement
-from notpip._vendor.packaging.version import Version, InvalidVersion, parse as parse_version
-from notpip._vendor.packaging.specifiers import SpecifierSet
-from notpip._vendor.pyparsing import ParseException
+from pipenv.patched.notpip._vendor.packaging.requirements import InvalidRequirement, Requirement
+from pipenv.patched.notpip._vendor.packaging.version import Version, InvalidVersion, parse as parse_version
+from pipenv.patched.notpip._vendor.packaging.specifiers import SpecifierSet
+from pipenv.patched.notpip._vendor.pyparsing import ParseException
 
 from ..cache import CACHE_DIR
 from pipenv.environments import PIPENV_CACHE_DIR
@@ -37,15 +37,15 @@
 
 
 try:
-    from notpip._internal.operations.prepare import RequirementPreparer
-    from notpip._internal.resolve import Resolver as PipResolver
+    from pipenv.patched.notpip._internal.operations.prepare import RequirementPreparer
+    from pipenv.patched.notpip._internal.resolve import Resolver as PipResolver
 except ImportError:
     pass
 
 try:
-    from notpip._internal.cache import WheelCache
+    from pipenv.patched.notpip._internal.cache import WheelCache
 except ImportError:
-    from notpip.wheel import WheelCache
+    from pipenv.patched.notpip.wheel import WheelCache
 
 
 class HashCache(SafeFileCache):

diff --git a/pipenv/patched/piptools/resolver.py b/pipenv/patched/piptools/resolver.py
@@ -8,7 +8,7 @@
 import os
 
 from first import first
-from notpip._vendor.packaging.markers import default_environment
+from pipenv.patched.notpip._vendor.packaging.markers import default_environment
 from ._compat import InstallRequirement
 
 from . import click
@@ -314,7 +314,7 @@ def _iter_dependencies(self, ireq):
         dependency_strings = self.dependency_cache[ireq]
         log.debug('  {:25} requires {}'.format(format_requirement(ireq),
                                                ', '.join(sorted(dependency_strings, key=lambda s: s.lower())) or '-'))
-        from notpip._vendor.packaging.markers import InvalidMarker
+        from pipenv.patched.notpip._vendor.packaging.markers import InvalidMarker
         for dependency_string in dependency_strings:
             try:
                 _dependency_string = dependency_string