Switch from appdirs to platformdirs

pyproject.toml

@@ -48,8 +48,8 @@ drop = [
 
 [tool.vendoring.typing-stubs]
 six = ["six.__init__", "six.moves.__init__", "six.moves.configparser"]
-appdirs = []
 distro = []
+platformdirs = []
 
 [tool.vendoring.license.directories]
 setuptools = "pkg_resources"

src/pip/_internal/utils/appdirs.py

@@ -9,7 +9,7 @@
 import os
 from typing import List
 
-from pip._vendor import appdirs as _appdirs
+from pip._vendor import platformdirs as _appdirs
 
 
 def user_cache_dir(appname: str) -> str:
@@ -29,7 +29,11 @@ def user_config_dir(appname: str, roaming: bool = True) -> str:
 # see <https://github.com/pypa/pip/issues/1733>
 def site_config_dirs(appname: str) -> List[str]:
     dirval = _appdirs.site_config_dir(appname, appauthor=False, multipath=True)
-    if _appdirs.system not in ["win32", "darwin"]:
+    if _appdirs.system == "darwin":
+        # always look in /Library/Application Support/pip as well
+        return dirval.split(os.pathsep) + ["/Library/Application Support/pip"]
+    elif _appdirs.system == "win32":
+        return [dirval]
+    else:
         # always look in /etc directly as well
         return dirval.split(os.pathsep) + ["/etc"]
-    return [dirval]

src/pip/_vendor/__init__.py

@@ -58,7 +58,6 @@ def vendored(modulename):
     sys.path[:] = glob.glob(os.path.join(WHEEL_DIR, "*.whl")) + sys.path
 
     # Actually alias all of our vendored dependencies.
-    vendored("appdirs")
     vendored("cachecontrol")
     vendored("certifi")
     vendored("colorama")
@@ -74,6 +73,7 @@ def vendored(modulename):
     vendored("packaging.specifiers")
     vendored("pep517")
     vendored("pkg_resources")
+    vendored("platformdirs")
     vendored("progress")
     vendored("requests")
     vendored("requests.exceptions")

src/pip/_vendor/pkg_resources/__init__.py

@@ -77,7 +77,7 @@
     importlib_machinery = None
 
 from . import py31compat
-from pip._vendor import appdirs
+from pip._vendor import platformdirs
 from pip._vendor import packaging
 __import__('pip._vendor.packaging.version')
 __import__('pip._vendor.packaging.specifiers')
@@ -1310,7 +1310,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')
     )