Skip to content

Commit d865a90

Browse files
author
boonhapus
committed
centralize platform_tags logic since it varies across releases
1 parent fbb4d47 commit d865a90

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

cs_tools/cli/commands/self.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import pathlib
77
import shutil
88
import sys
9-
import sysconfig
109
import zipfile
1110

1211
from cs_tools import __version__, _types, updater, utils
@@ -53,10 +52,9 @@ def info(
5352
f"\n System Info: [fg-warn]{meta.local_system.system}[/]"
5453
f"\n Configs Directory: [fg-warn]{cs_tools_venv.base_dir}[/]"
5554
f"\nActivate VirtualEnv: [fg-warn]{source}[/]"
56-
f"\n Platform Tags: [fg-warn]{sysconfig.get_platform()}[/]"
55+
f"\n Platform Tags: [fg-warn]{utils.platform_tag()}[/]"
5756
f"\n"
5857
)
59-
6058
if anonymous:
6159
text = utils.anonymize(text, anonymizer=" [dim]{anonymous}[/] ")
6260

cs_tools/utils.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import logging
2020
import pathlib
2121
import sys
22+
import sysconfig
2223
import zipfile
2324
import zlib
2425

@@ -101,6 +102,19 @@ async def with_backpressure(coro: Awaitable) -> Any:
101102
return await asyncio.gather(*(with_backpressure(coro) for coro in aws), return_exceptions=return_exceptions)
102103

103104

105+
def platform_tag() -> str:
106+
"""Return the platform tag for use in pip download."""
107+
try:
108+
from pip._vendor.packaging.tags import platform_tags
109+
110+
platform_tag = next(iter(platform_tags()))
111+
except Exception:
112+
_LOG.debug("Could not fetch platform tags from vendored pip.packaging, falling back to sysconfig.")
113+
platform_tag = sysconfig.get_platform()
114+
115+
return platform_tag
116+
117+
104118
def batched(iterable: Iterable[_T], *, n: int) -> Generator[Iterable[_T], None, None]:
105119
"""Yield successive n-sized chunks from list."""
106120
# batched('ABCDEFG', 3) --> ABC DEF G

0 commit comments

Comments
 (0)