Vendoring in pip 22.2.2

news/5230.vendor.rst

@@ -0,0 +1 @@
+Vendor in minor ``pip`` update ``22.2.2``

pipenv/patched/patched.txt

@@ -1,3 +1,3 @@
-pip==22.2.1
+pip==22.2.2
 pipfile==0.0.2
 safety==1.10.3

pipenv/patched/pip/__init__.py

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "22.2.1"
+__version__ = "22.2.2"
 
 
 def main(args: Optional[List[str]] = None) -> int:

pipenv/patched/pip/__pip-runner__.py

@@ -30,7 +30,6 @@ def find_spec(
         return spec
 
 
-# TODO https://github.com/pypa/pip/issues/11294
 sys.meta_path.insert(0, PipImportRedirectingFinder())
 
 assert __name__ == "__main__", "Cannot run __pip-runner__.py as a non-main module"

pipenv/patched/pip/_internal/index/collector.py

@@ -345,6 +345,7 @@ def parse_links(page: "IndexContent") -> Iterable[Link]:
                 yanked_reason=yanked_reason,
                 hashes=file.get("hashes", {}),
             )
+        return
 
     parser = HTMLLinkParser(page.url)
     encoding = page.encoding or "utf-8"

pipenv/patched/pip/_internal/locations/__init__.py

@@ -60,6 +60,12 @@ def _should_use_sysconfig() -> bool:
 
 _USE_SYSCONFIG = _should_use_sysconfig()
 
+if not _USE_SYSCONFIG:
+    # Import distutils lazily to avoid deprecation warnings,
+    # but import it soon enough that it is in memory and available during
+    # a pip reinstall.
+    from . import _distutils
+
 # Be noisy about incompatibilities if this platforms "should" be using
 # sysconfig, but is explicitly opting out and using distutils instead.
 if _USE_SYSCONFIG_DEFAULT and not _USE_SYSCONFIG:
@@ -241,8 +247,6 @@ def get_scheme(
     if _USE_SYSCONFIG:
         return new
 
-    from . import _distutils
-
     old = _distutils.get_scheme(
         dist_name,
         user=user,
@@ -407,8 +411,6 @@ def get_bin_prefix() -> str:
     if _USE_SYSCONFIG:
         return new
 
-    from . import _distutils
-
     old = _distutils.get_bin_prefix()
     if _warn_if_mismatch(pathlib.Path(old), pathlib.Path(new), key="bin_prefix"):
         _log_context()
@@ -442,8 +444,6 @@ def get_purelib() -> str:
     if _USE_SYSCONFIG:
         return new
 
-    from . import _distutils
-
     old = _distutils.get_purelib()
     if _looks_like_deb_system_dist_packages(old):
         return old
@@ -488,8 +488,6 @@ def get_prefixed_libs(prefix: str) -> List[str]:
     if _USE_SYSCONFIG:
         return _deduplicated(new_pure, new_plat)
 
-    from . import _distutils
-
     old_pure, old_plat = _distutils.get_prefixed_libs(prefix)
     old_lib_paths = _deduplicated(old_pure, old_plat)
 

pipenv/patched/pip/_internal/locations/_distutils.py

@@ -11,7 +11,7 @@
 # rationale for why this is done within pip.
 try:
     __import__("_distutils_hack").remove_shim()
-except ImportError:
+except (ImportError, AttributeError):
     pass
 
 import logging

pipenv/patched/pip/_internal/utils/deprecation.py

@@ -13,7 +13,7 @@
 DEPRECATION_MSG_PREFIX = "DEPRECATION: "
 
 
-class PipDeprecationWarning(DeprecationWarning):
+class PipDeprecationWarning(Warning):
     pass