Vendor in requirementslib==2.0.0 & drop pip-shims & revert sysconfig patch w/ safer setuptools usage

news/5228.bugfix.rst

@@ -0,0 +1,2 @@
+Remove eager and unnecessary importing of ``setuptools`` and ``pkg_resources`` to avoid conflict upgrading ``setuptools``.
+Roll back ``sysconfig`` patch of ``pip`` because it was problematic for some ``--system`` commands.

news/5228.vendor.rst

@@ -0,0 +1 @@
+Vendor in ``requirementslib==2.0.0`` and drop ``pip-shims`` entirely.

pipenv/__init__.py

@@ -27,7 +27,6 @@
 
 
 # Load patched pip instead of system pip
-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

@@ -2095,7 +2095,6 @@ def do_install(
                 pypi_mirror=pypi_mirror,
                 skip_lock=skip_lock,
             )
-        pip_shims_module = os.environ.pop("PIP_SHIMS_BASE_MODULE", None)
         for pkg_line in pkg_list:
             click.secho(
                 fix_utf8(f"Installing {pkg_line}..."),
@@ -2232,8 +2231,6 @@ def do_install(
             # Update project settings with pre preference.
             if pre:
                 project.update_settings({"allow_prereleases": pre})
-        if pip_shims_module:
-            os.environ["PIP_SHIMS_BASE_MODULE"] = pip_shims_module
         do_init(
             project,
             dev=dev,
@@ -2439,8 +2436,6 @@ def do_shell(
     # otherwise its value will be changed
     os.environ["PIPENV_ACTIVE"] = "1"
 
-    os.environ.pop("PIP_SHIMS_BASE_MODULE", None)
-
     if fancy:
         shell.fork(*fork_args)
         return
@@ -2591,7 +2586,6 @@ def do_run(
 
     load_dot_env(project, quiet=quiet)
     env = os.environ.copy()
-    env.pop("PIP_SHIMS_BASE_MODULE", None)
 
     path = env.get("PATH", "")
     if project.virtualenv_location:
@@ -2609,7 +2603,6 @@ def do_run(
     # such as in inline_activate_virtual_environment
     # otherwise its value will be changed
     env["PIPENV_ACTIVE"] = "1"
-    env.pop("PIP_SHIMS_BASE_MODULE", None)
 
     try:
         script = project.build_script(command, args)

pipenv/environment.py

@@ -16,6 +16,7 @@
 import pipenv
 from pipenv.patched.pip._internal.commands.install import InstallCommand
 from pipenv.patched.pip._internal.index.package_finder import PackageFinder
+from pipenv.patched.pip._internal.req.req_uninstall import UninstallPathSet
 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
@@ -954,24 +955,6 @@ def which(self, search, as_path=True):
                 result = str(result.path)
         return result
 
-    def get_install_args(self, editable=False, setup_path=None):
-        install_arg = "install" if not editable else "develop"
-        install_keys = ["headers", "purelib", "platlib", "scripts", "data"]
-        install_args = [
-            self.environment.python,
-            "-u",
-            "-c",
-            SETUPTOOLS_SHIM % setup_path,
-            install_arg,
-            "--single-version-externally-managed",
-            "--no-deps",
-            "--prefix={}".format(self.base_paths["prefix"]),
-            "--no-warn-script-location",
-        ]
-        for key in install_keys:
-            install_args.append(f"--install-{key}={self.base_paths[key]}")
-        return install_args
-
     def install(self, requirements):
         if not isinstance(requirements, (tuple, list)):
             requirements = [requirements]
@@ -1031,36 +1014,19 @@ def uninstall(self, pkgname, *args, **kwargs):
             )
             if monkey_patch:
                 monkey_patch.activate()
-            pip_shims = self.safe_import("pip_shims")
-            pathset_base = pip_shims.UninstallPathSet
-            pathset_base._permitted = PatchedUninstaller._permitted
             dist = next(
                 iter(d for d in self.get_working_set() if d.project_name == pkgname), None
             )
-            pathset = pathset_base.from_dist(dist)
-            if pathset is not None:
-                pathset.remove(auto_confirm=auto_confirm, verbose=verbose)
+            path_set = UninstallPathSet.from_dist(dist)
+            if path_set is not None:
+                path_set.remove(auto_confirm=auto_confirm, verbose=verbose)
             try:
-                yield pathset
+                yield path_set
             except Exception:
-                if pathset is not None:
-                    pathset.rollback()
+                if path_set is not None:
+                    path_set.rollback()
             else:
-                if pathset is not None:
-                    pathset.commit()
-            if pathset is None:
+                if path_set is not None:
+                    path_set.commit()
+            if path_set is None:
                 return
-
-
-class PatchedUninstaller:
-    def _permitted(self, path):
-        return True
-
-
-SETUPTOOLS_SHIM = (
-    "import setuptools, tokenize;__file__=%r;"
-    "f=getattr(tokenize, 'open', open)(__file__);"
-    "code=f.read().replace('\\r\\n', '\\n');"
-    "f.close();"
-    "exec(compile(code, __file__, 'exec'))"
-)

pipenv/help.py

@@ -8,16 +8,12 @@
 
 
 def get_pipenv_diagnostics(project):
-    import setuptools
-
     print("<details><summary>$ pipenv --support</summary>")
     print("")
     print(f"Pipenv version: `{pipenv.__version__!r}`")
     print("")
     print(f"Pipenv location: `{os.path.dirname(pipenv.__file__)!r}`")
     print("")
-    print(f"setuptools version: `{setuptools.__version__!r}`")
-    print("")
     print(f"Python location: `{sys.executable!r}`")
     print("")
     print(f"OS Name: `{os.name!r}`")

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

@@ -41,7 +41,7 @@
 
 _PLATLIBDIR: str = getattr(sys, "platlibdir", "lib")
 
-_USE_SYSCONFIG_DEFAULT = sys.version_info >= (3, 7)
+_USE_SYSCONFIG_DEFAULT = sys.version_info >= (3, 10)
 
 
 def _should_use_sysconfig() -> bool:

pipenv/utils/dependencies.py

@@ -4,6 +4,7 @@
 from typing import Mapping, Sequence
 
 from pipenv.patched.pip._vendor.packaging.markers import Marker
+from pipenv.patched.pip._vendor.packaging.version import parse
 
 from .constants import SCHEME_LIST, VCS_LIST
 from .shell import temp_path
@@ -61,10 +62,7 @@ def get_canonical_names(packages):
 
 def pep440_version(version):
     """Normalize version to PEP 440 standards"""
-    # Use pip built-in version parser.
-    from pipenv.vendor.pip_shims import shims
-
-    return str(shims.parse_version(version))
+    return str(parse(version))
 
 
 def pep423_name(name):
@@ -360,12 +358,6 @@ def locked_repository(requirement):
 
     if not requirement.is_vcs:
         return
-    original_base = os.environ.pop("PIP_SHIMS_BASE_MODULE", None)
-    os.environ["PIP_SHIMS_BASE_MODULE"] = "pipenv.patched.pip"
     src_dir = create_tracked_tempdir(prefix="pipenv-", suffix="-src")
-    try:
-        with requirement.req.locked_vcs_repo(src_dir=src_dir) as repo:
-            yield repo
-    finally:
-        if original_base:
-            os.environ["PIP_SHIMS_BASE_MODULE"] = original_base
+    with requirement.req.locked_vcs_repo(src_dir=src_dir) as repo:
+        yield repo