Skip to content

Commit 85e128b

Browse files
committed
Upgrade platformdirs to 2.6.2
1 parent 29bd6f2 commit 85e128b

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

news/platformdirs.vendor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Upgrade platformdirs to 2.5.3
1+
Upgrade platformdirs to 2.6.2

src/pip/_vendor/platformdirs/__init__.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
import os
88
import sys
99
from pathlib import Path
10-
from typing import TYPE_CHECKING
1110

12-
if TYPE_CHECKING:
13-
from pip._vendor.typing_extensions import Literal # pragma: no cover
11+
if sys.version_info >= (3, 8): # pragma: no cover (py38+)
12+
from typing import Literal
13+
else: # pragma: no cover (py38+)
14+
from pip._vendor.typing_extensions import Literal
1415

1516
from .api import PlatformDirsABC
16-
from .version import __version__, __version_info__
17+
from .version import __version__
18+
from .version import __version_tuple__ as __version_info__
1719

1820

1921
def _set_platform_dir_class() -> type[PlatformDirsABC]:
@@ -26,7 +28,7 @@ def _set_platform_dir_class() -> type[PlatformDirsABC]:
2628

2729
if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system":
2830

29-
if os.getenv("SHELL") is not None:
31+
if os.getenv("SHELL") or os.getenv("PREFIX"):
3032
return Result
3133

3234
from pip._vendor.platformdirs.android import _android_folder

src/pip/_vendor/platformdirs/unix.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ def user_state_dir(self) -> str:
107107
@property
108108
def user_log_dir(self) -> str:
109109
"""
110-
:return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``log`` in it
110+
:return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it
111111
"""
112-
path = self.user_cache_dir
112+
path = self.user_state_dir
113113
if self.opinion:
114114
path = os.path.join(path, "log")
115115
return path
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""Version information"""
2-
3-
__version__ = "2.5.3"
4-
__version_info__ = (2, 5, 3)
1+
# file generated by setuptools_scm
2+
# don't change, don't track in version control
3+
__version__ = version = '2.6.2'
4+
__version_tuple__ = version_tuple = (2, 6, 2)

src/pip/_vendor/vendor.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ distlib==0.3.6
44
distro==1.8.0
55
msgpack==1.0.4
66
packaging==21.3
7-
platformdirs==2.5.3
7+
platformdirs==2.6.2
88
pyparsing==3.0.9
99
pyproject-hooks==1.0.0
1010
requests==2.28.1

0 commit comments

Comments
 (0)