diff options
author | Pradyun Gedam <pradyunsg@users.noreply.github.com> | 2023-01-28 20:41:07 +0000 |
---|---|---|
committer | Pradyun Gedam <pradyunsg@users.noreply.github.com> | 2023-01-28 22:11:28 +0000 |
commit | 85e128b2d91db1ec90df2be0503e1d061c3e2de7 (patch) | |
tree | caaf044fbe7cdd85e62cc270ee0f1ec1af383cc0 | |
parent | 29bd6f209981731c5bae38d268c3723f56874dc8 (diff) | |
download | pip-85e128b2d91db1ec90df2be0503e1d061c3e2de7.tar.gz |
Upgrade platformdirs to 2.6.2
-rw-r--r-- | news/platformdirs.vendor.rst | 2 | ||||
-rw-r--r-- | src/pip/_vendor/platformdirs/__init__.py | 12 | ||||
-rw-r--r-- | src/pip/_vendor/platformdirs/unix.py | 4 | ||||
-rw-r--r-- | src/pip/_vendor/platformdirs/version.py | 8 | ||||
-rw-r--r-- | src/pip/_vendor/vendor.txt | 2 |
5 files changed, 15 insertions, 13 deletions
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst index 04ee05723..5c15bfbd9 100644 --- a/news/platformdirs.vendor.rst +++ b/news/platformdirs.vendor.rst @@ -1 +1 @@ -Upgrade platformdirs to 2.5.3 +Upgrade platformdirs to 2.6.2 diff --git a/src/pip/_vendor/platformdirs/__init__.py b/src/pip/_vendor/platformdirs/__init__.py index 9d513dcf1..82d907163 100644 --- a/src/pip/_vendor/platformdirs/__init__.py +++ b/src/pip/_vendor/platformdirs/__init__.py @@ -7,13 +7,15 @@ from __future__ import annotations import os import sys from pathlib import Path -from typing import TYPE_CHECKING -if TYPE_CHECKING: - from pip._vendor.typing_extensions import Literal # pragma: no cover +if sys.version_info >= (3, 8): # pragma: no cover (py38+) + from typing import Literal +else: # pragma: no cover (py38+) + from pip._vendor.typing_extensions import Literal from .api import PlatformDirsABC -from .version import __version__, __version_info__ +from .version import __version__ +from .version import __version_tuple__ as __version_info__ def _set_platform_dir_class() -> type[PlatformDirsABC]: @@ -26,7 +28,7 @@ def _set_platform_dir_class() -> type[PlatformDirsABC]: if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system": - if os.getenv("SHELL") is not None: + if os.getenv("SHELL") or os.getenv("PREFIX"): return Result from pip._vendor.platformdirs.android import _android_folder diff --git a/src/pip/_vendor/platformdirs/unix.py b/src/pip/_vendor/platformdirs/unix.py index 2fbd4d4f3..9aca5a030 100644 --- a/src/pip/_vendor/platformdirs/unix.py +++ b/src/pip/_vendor/platformdirs/unix.py @@ -107,9 +107,9 @@ class Unix(PlatformDirsABC): @property def user_log_dir(self) -> str: """ - :return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``log`` in it + :return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it """ - path = self.user_cache_dir + path = self.user_state_dir if self.opinion: path = os.path.join(path, "log") return path diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py index 6361dbf9c..9f6eb98e8 100644 --- a/src/pip/_vendor/platformdirs/version.py +++ b/src/pip/_vendor/platformdirs/version.py @@ -1,4 +1,4 @@ -"""Version information""" - -__version__ = "2.5.3" -__version_info__ = (2, 5, 3) +# file generated by setuptools_scm +# don't change, don't track in version control +__version__ = version = '2.6.2' +__version_tuple__ = version_tuple = (2, 6, 2) diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index 26afe72d1..282f627a6 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -4,7 +4,7 @@ distlib==0.3.6 distro==1.8.0 msgpack==1.0.4 packaging==21.3 -platformdirs==2.5.3 +platformdirs==2.6.2 pyparsing==3.0.9 pyproject-hooks==1.0.0 requests==2.28.1 |