Skip to content

Commit 0dc9ce3

Browse files
committed
more manal cleanups to remove python<=3.7 support
Signed-off-by: Tomasz Kłoczko <[email protected]>
1 parent fbbbbc6 commit 0dc9ce3

File tree

4 files changed

+3
-31
lines changed

4 files changed

+3
-31
lines changed

docs/conf.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
import warnings
1414
from pathlib import Path
1515

16-
if sys.version_info < (3, 8):
17-
import importlib_metadata
18-
else:
19-
import importlib.metadata as importlib_metadata
20-
2116
try:
2217
import scikit_build_core
2318
except ModuleNotFoundError:
@@ -32,7 +27,7 @@
3227
from scikit_build_core import __version__ as version
3328
except ModuleNotFoundError:
3429
try:
35-
version = importlib_metadata.version("scikit_build_core")
30+
version = importlib.metadata.version("scikit_build_core")
3631
except ModuleNotFoundError:
3732
msg = (
3833
"Package should be installed to produce documentation! "

src/scikit_build_core/_compat/importlib/metadata.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
from importlib.metadata import PathDistribution, version
77

88
if typing.TYPE_CHECKING:
9-
if sys.version_info < (3, 8):
10-
from importlib_metadata import EntryPoints
11-
elif sys.version_info < (3, 10):
9+
if sys.version_info < (3, 10):
1210
from importlib.metadata import EntryPoint
1311

1412
EntryPoints = typing.List[EntryPoint]
@@ -23,10 +21,6 @@ def entry_points(*, group: str) -> EntryPoints:
2321
return _metadata.entry_points(group=group)
2422

2523
epg = _metadata.entry_points()
26-
27-
if sys.version_info < (3, 8) and hasattr(epg, "select"):
28-
return epg.select(group=group) # type: ignore[no-any-return, no-untyped-call]
29-
3024
return epg.get(group, [])
3125

3226

src/scikit_build_core/builder/sysconfig.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,6 @@ def get_host_platform() -> str:
116116
Return a string that identifies the current platform. This mimics
117117
setuptools get_host_platform (without 3.8 aix compat).
118118
"""
119-
120-
if sys.version_info < (3, 8) and os.name == "nt":
121-
if "(arm)" in sys.version.lower():
122-
return "win-arm32"
123-
if "(arm64)" in sys.version.lower():
124-
return "win-arm64"
125-
126119
return sysconfig.get_platform()
127120

128121

@@ -163,13 +156,7 @@ def get_soabi(env: Mapping[str, str], *, abi3: bool = False) -> str:
163156
if setuptools_ext_suffix:
164157
return setuptools_ext_suffix.rsplit(".", 1)[0].lstrip(".")
165158

166-
if sys.version_info < (3, 8, 7):
167-
# See https://github.com/python/cpython/issues/84006
168-
import distutils.sysconfig # pylint: disable=deprecated-module
169-
170-
ext_suffix = distutils.sysconfig.get_config_var("EXT_SUFFIX")
171-
else:
172-
ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
159+
ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
173160

174161
assert isinstance(ext_suffix, str)
175162
return ext_suffix.rsplit(".", 1)[0].lstrip(".")

src/scikit_build_core/settings/documentation.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ def __dir__() -> list[str]:
2424

2525

2626
def _get_value(value: ast.expr) -> str:
27-
if sys.version_info < (3, 8):
28-
assert isinstance(value, ast.Str)
29-
return value.s
30-
3127
assert isinstance(value, ast.Constant)
3228
assert isinstance(value.value, str)
3329
return value.value

0 commit comments

Comments
 (0)