Revert "Upgrade setuptools to 67.6.1"

This reverts commit d7e0248326.
This commit is contained in:
Paul Moore 2023-04-17 17:46:47 +01:00
parent 7df10eeefd
commit c8b49cac1e
4 changed files with 293 additions and 331 deletions

View File

@ -0,0 +1 @@
Revert pkg_resources (via setuptools) back to 65.6.3

File diff suppressed because it is too large Load Diff

View File

@ -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==65.6.3
six==1.16.0
tenacity==8.2.2
tomli==2.0.1

View File

@ -1,3 +1,25 @@
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