news/setuptools.vendor.rst

+Upgrade setuptools to 67.7.2

src/pip/_internal/cli/main.py

@@ -4,6 +4,7 @@ import locale
 import logging
 import os
 import sys
+import warnings
 from typing import List, Optional
 
 from 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 (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()
 

src/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==65.6.3
+setuptools==67.7.2
 six==1.16.0
 tenacity==8.2.2
 tomli==2.0.1

tools/vendoring/patches/pkg_resources.patch

-diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
-index d59226af9..3b9565893 100644
---- a/src/pip/_vendor/pkg_resources/__init__.py
-+++ b/src/pip/_vendor/pkg_resources/__init__.py
-@@ -77,7 +77,7 @@
-     join_continuation,
- )
-
--from pkg_resources.extern import appdirs
-+from pkg_resources.extern import platformdirs
- from pkg_resources.extern import packaging
- __import__('pkg_resources.extern.packaging.version')
- __import__('pkg_resources.extern.packaging.specifiers')
-@@ -1321,7 +1321,7 @@ def get_default_cache():
-     """
-     return (
-         os.environ.get('PYTHON_EGG_CACHE')
--        or appdirs.user_cache_dir(appname='Python-Eggs')
-+        or platformdirs.user_cache_dir(appname='Python-Eggs')
-     )
-
-
 diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
 index 3f2476a0c..8d5727d35 100644
 --- a/src/pip/_vendor/pkg_resources/__init__.py