Rename notpip to pip. Vendor in pip-22.2.1 and latest requirementslib…

… and vistir.

MANIFEST.in

@@ -12,7 +12,7 @@ recursive-include pipenv/vendor vendor.txt
 recursive-include pipenv *.json
 recursive-include pipenv *.rst
 
-include pipenv/patched/notpip/_vendor/vendor.txt
+include pipenv/patched/pip/_vendor/vendor.txt
 include  pipenv/patched/patched.txt
 include pipenv/vendor/Makefile
 include pipenv/pipenv.1

Makefile

@@ -11,7 +11,7 @@ CLEAN_TARGETS := $(addprefix clean-py,$(PY_VERSIONS))
 DATE_STRING := $(shell date +%Y.%m.%d)
 THIS_MONTH_DATE := $(shell date +%Y.%m.01)
 NEXT_MONTH_DATE := $(shell date -d "+1 month" +%Y.%m.01)
-PATCHED_PIP_VERSION := $(shell awk '/__version__/{gsub(/"/,"",$$3); print $$3}' pipenv/patched/notpip/__init__.py)
+PATCHED_PIP_VERSION := $(shell awk '/__version__/{gsub(/"/,"",$$3); print $$3}' pipenv/patched/pip/__init__.py)
 GITDIR_STAMPFILE := $(CURDIR)/.git-checkout-dir
 create_git_tmpdir = $(shell mktemp -dt pipenv-vendor-XXXXXXXX 2>/dev/null || mktemp -d 2>/dev/null)
 write_git_tmpdir = $(file > $(GITDIR_STAMPFILE),$(create_git_tmpdir))

news/5188.vendor.rst

@@ -0,0 +1,5 @@
+* Rename patched ``notpip`` to ``pip`` in order to be clear that its a patched version of pip.
+* Remove the part of _post_pip_import.patch that overrode the standalone pip to be the user installed pip,
+now we fully rely on our vendored and patched ``pip``, even for all types of installs.
+* Vendor in the next newest version of ``pip==22.2``
+* Modify patch for ``pipdeptree`` to not use ``pip-shims``

pipenv/__init__.py

@@ -24,7 +24,7 @@
 warnings.filterwarnings("ignore", category=UserWarning)
 
 # Load patched pip instead of system pip
-os.environ["PIP_SHIMS_BASE_MODULE"] = "pipenv.patched.notpip"
+os.environ["PIP_SHIMS_BASE_MODULE"] = "pipenv.patched.pip"
 os.environ["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
 
 # Hack to make things work better.

pipenv/core.py

@@ -84,7 +84,7 @@
 
 
 def do_clear(project):
-    from pipenv.patched.notpip._internal import locations
+    from pipenv.patched.pip._internal import locations
 
     click.secho(fix_utf8("Clearing caches..."), bold=True)
     try:
@@ -160,10 +160,10 @@ def cleanup_virtualenv(project, bare=True):
 
 
 def import_requirements(project, r=None, dev=False):
-    from pipenv.patched.notpip._internal.req.constructors import (
+    from pipenv.patched.pip._internal.req.constructors import (
         install_req_from_parsed_requirement,
     )
-    from pipenv.patched.notpip._vendor import requests
+    from pipenv.patched.pip._vendor import requests
     from pipenv.vendor.pip_shims.shims import parse_requirements
 
     # Parse requirements.txt file with Pip's parser.
@@ -1141,7 +1141,7 @@ def do_lock(
 
     # Support for --keep-outdated...
     if keep_outdated:
-        from pipenv.patched.notpip._vendor.packaging.utils import canonicalize_name
+        from pipenv.patched.pip._vendor.packaging.utils import canonicalize_name
 
         for section_name, section in (
             ("default", project.packages),
@@ -1372,7 +1372,7 @@ def get_pip_args(
     selective_upgrade: bool = False,
     src_dir: Optional[str] = None,
 ) -> List[str]:
-    from pipenv.patched.notpip._vendor.packaging.version import parse as parse_version
+    from pipenv.patched.pip._vendor.packaging.version import parse as parse_version
 
     arg_map = {
         "pre": ["--pre"],
@@ -1472,7 +1472,7 @@ def pip_install(
     trusted_hosts=None,
     use_pep517=True,
 ):
-    piplogger = logging.getLogger("pipenv.patched.notpip._internal.commands.install")
+    piplogger = logging.getLogger("pipenv.patched.pip._internal.commands.install")
     if not trusted_hosts:
         trusted_hosts = []
     trusted_hosts.extend(os.environ.get("PIP_TRUSTED_HOSTS", []))
@@ -1850,7 +1850,7 @@ def do_outdated(project, pypi_mirror=None, pre=False, clear=False):
     from collections import namedtuple
     from collections.abc import Mapping
 
-    from pipenv.patched.notpip._vendor.packaging.utils import canonicalize_name
+    from pipenv.patched.pip._vendor.packaging.utils import canonicalize_name
 
     from .vendor.requirementslib.models.requirements import Requirement
     from .vendor.requirementslib.models.utils import get_version
@@ -2293,7 +2293,7 @@ def do_uninstall(
     pypi_mirror=None,
     ctx=None,
 ):
-    from pipenv.patched.notpip._vendor.packaging.utils import canonicalize_name
+    from pipenv.patched.pip._vendor.packaging.utils import canonicalize_name
 
     from .vendor.requirementslib.models.requirements import Requirement
 
@@ -3010,7 +3010,7 @@ def do_clean(
     system=False,
 ):
     # Ensure that virtualenv is available.
-    from pipenv.patched.notpip._vendor.packaging.utils import canonicalize_name
+    from pipenv.patched.pip._vendor.packaging.utils import canonicalize_name
 
     ensure_project(
         project, three=three, python=python, validate=False, pypi_mirror=pypi_mirror

pipenv/environment.py

@@ -14,7 +14,7 @@
 import pkg_resources
 
 import pipenv
-from pipenv.patched.notpip._vendor.packaging.utils import canonicalize_name
+from pipenv.patched.pip._vendor.packaging.utils import canonicalize_name
 from pipenv.utils.constants import is_type_checking
 from pipenv.utils.indexes import prepare_pip_source_args
 from pipenv.utils.processes import subprocess_run
@@ -29,7 +29,7 @@
     import pip_shims.shims
     import tomlkit
 
-    from pipenv.patched.notpip._vendor.packaging.version import Version
+    from pipenv.patched.pip._vendor.packaging.version import Version
     from pipenv.project import Project, TPipfile, TSource
 
 BASE_WORKING_SET = pkg_resources.WorkingSet(sys.path)
@@ -545,9 +545,7 @@ def pip_version(self) -> Version:
         Get the pip version in the environment.  Useful for knowing which args we can use
         when installing.
         """
-        from pipenv.patched.notpip._vendor.packaging.version import (
-            parse as parse_version,
-        )
+        from pipenv.patched.pip._vendor.packaging.version import parse as parse_version
 
         pip = next(
             iter(pkg for pkg in self.get_installed_packages() if pkg.key == "pip"), None