Vendor in Pip.23.1.2 (#5671)

* Vendor in latest pip 23.1.2
pypa · Apr 29, 2023 · 44f4250 · 44f4250
1 parent 0efd996
commit 44f4250
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/news/5671.vendor.rst b/news/5671.vendor.rst
@@ -0,0 +1 @@
+Vendor in ``pip==23.1.2`` latest.
diff --git a/pipenv/patched/patched.txt b/pipenv/patched/patched.txt
@@ -1,2 +1,2 @@
-pip==23.1
+pip==23.1.2
 safety==2.3.2
diff --git a/pipenv/patched/pip/__init__.py b/pipenv/patched/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "23.1"
+__version__ = "23.1.2"
 
 
 def main(args: Optional[List[str]] = None) -> int:

diff --git a/pipenv/patched/pip/_internal/cli/main.py b/pipenv/patched/pip/_internal/cli/main.py
@@ -4,6 +4,7 @@
 import logging
 import os
 import sys
+import warnings
 from typing import List, Optional
 
 from pipenv.patched.pip._internal.cli.autocompletion import autocomplete
@@ -46,6 +47,14 @@ def main(args: Optional[List[str]] = None) -> int:
  if args is None:
  args = sys.argv[1:]
 
+ # Suppress the pkg_resources deprecation warning
+ # Note - we use a module of .*pkg_resources to cover
+ # the normal case (pipenv.patched.pip._vendor.pkg_resources) and the
+ # devendored case (a bare pkg_resources)
+ warnings.filterwarnings(
+ action="ignore", category=DeprecationWarning, module=".*pkg_resources"
+ )
+
  # Configure our deprecation warnings to be sent through loggers
  deprecation.install_warning_logger()
 

diff --git a/pipenv/patched/pip/_internal/configuration.py b/pipenv/patched/pip/_internal/configuration.py
@@ -36,20 +36,12 @@
 kinds = enum(
  USER="user", # User Specific
  GLOBAL="global", # System Wide
- BASE="base", # Base environment specific (e.g. for all venvs with the same base)
- SITE="site", # Environment Specific (e.g. per venv)
+ SITE="site", # [Virtual] Environment Specific
  ENV="env", # from PIP_CONFIG_FILE
  ENV_VAR="env-var", # from Environment Variables
 )
-OVERRIDE_ORDER = (
- kinds.GLOBAL,
- kinds.USER,
- kinds.BASE,
- kinds.SITE,
- kinds.ENV,
- kinds.ENV_VAR,
-)
-VALID_LOAD_ONLY = kinds.USER, kinds.GLOBAL, kinds.BASE, kinds.SITE
+OVERRIDE_ORDER = kinds.GLOBAL, kinds.USER, kinds.SITE, kinds.ENV, kinds.ENV_VAR
+VALID_LOAD_ONLY = kinds.USER, kinds.GLOBAL, kinds.SITE
 
 logger = getLogger(__name__)
 
@@ -78,7 +70,6 @@ def get_configuration_files() -> Dict[Kind, List[str]]:
  os.path.join(path, CONFIG_BASENAME) for path in appdirs.site_config_dirs("pip")
  ]
 
- base_config_file = os.path.join(sys.base_prefix, CONFIG_BASENAME)
  site_config_file = os.path.join(sys.prefix, CONFIG_BASENAME)
  legacy_config_file = os.path.join(
  os.path.expanduser("~"),
@@ -87,7 +78,6 @@ def get_configuration_files() -> Dict[Kind, List[str]]:
  )
  new_config_file = os.path.join(appdirs.user_config_dir("pip"), CONFIG_BASENAME)
  return {
- kinds.BASE: [base_config_file],
  kinds.GLOBAL: global_config_files,
  kinds.SITE: [site_config_file],
  kinds.USER: [legacy_config_file, new_config_file],
@@ -354,8 +344,6 @@ def iter_config_files(self) -> Iterable[Tuple[Kind, List[str]]]:
  # The legacy config file is overridden by the new config file
  yield kinds.USER, config_files[kinds.USER]
 
- yield kinds.BASE, config_files[kinds.BASE]
-
  # finally virtualenv configuration first trumping others
  yield kinds.SITE, config_files[kinds.SITE]
 

diff --git a/pipenv/patched/pip/_vendor/pkg_resources/__init__.py b/pipenv/patched/pip/_vendor/pkg_resources/__init__.py
@@ -3046,6 +3046,9 @@ def has_version(self):
  except ValueError:
  issue_warning("Unbuilt egg for " + repr(self))
  return False
+ except SystemError:
+ # TODO: remove this except clause when python/cpython#103632 is fixed.
+ return False
  return True
 
  def clone(self, **kw):

diff --git a/pipenv/patched/pip/_vendor/vendor.txt b/pipenv/patched/pip/_vendor/vendor.txt
@@ -16,7 +16,7 @@ rich==13.3.3
  pygments==2.14.0
  typing_extensions==4.5.0
 resolvelib==1.0.1
-setuptools==67.6.1
+setuptools==67.7.2
 six==1.16.0
 tenacity==8.2.2
 tomli==2.0.1