Skip to content

Commit

Permalink
more manal cleanups to remove python<=3.7 support
Browse files Browse the repository at this point in the history
Signed-off-by: Tomasz Kłoczko <[email protected]>
  • Loading branch information
kloczek authored and henryiii committed Jun 28, 2024
1 parent 512bbdd commit 06bfc2e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 32 deletions.
7 changes: 1 addition & 6 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
import warnings
from pathlib import Path

if sys.version_info < (3, 8):
import importlib_metadata
else:
import importlib.metadata as importlib_metadata

try:
import scikit_build_core
except ModuleNotFoundError:
Expand All @@ -32,7 +27,7 @@
from scikit_build_core import __version__ as version
except ModuleNotFoundError:
try:
version = importlib_metadata.version("scikit_build_core")
version = importlib.metadata.version("scikit_build_core")
except ModuleNotFoundError:
msg = (
"Package should be installed to produce documentation! "
Expand Down
8 changes: 1 addition & 7 deletions src/scikit_build_core/_compat/importlib/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
from importlib.metadata import PathDistribution, version

if typing.TYPE_CHECKING:
if sys.version_info < (3, 8):
from importlib_metadata import EntryPoints
elif sys.version_info < (3, 10):
if sys.version_info < (3, 10):
from importlib.metadata import EntryPoint

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

epg = _metadata.entry_points()

if sys.version_info < (3, 8) and hasattr(epg, "select"):
return epg.select(group=group) # type: ignore[no-any-return, no-untyped-call]

return epg.get(group, [])


Expand Down
15 changes: 1 addition & 14 deletions src/scikit_build_core/builder/sysconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,6 @@ def get_host_platform() -> str:
Return a string that identifies the current platform. This mimics
setuptools get_host_platform (without 3.8 aix compat).
"""

if sys.version_info < (3, 8) and os.name == "nt":
if "(arm)" in sys.version.lower():
return "win-arm32"
if "(arm64)" in sys.version.lower():
return "win-arm64"

return sysconfig.get_platform()


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

if sys.version_info < (3, 8, 7):
# See https://github.com/python/cpython/issues/84006
import distutils.sysconfig # pylint: disable=deprecated-module

ext_suffix = distutils.sysconfig.get_config_var("EXT_SUFFIX")
else:
ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")

assert isinstance(ext_suffix, str)
return ext_suffix.rsplit(".", 1)[0].lstrip(".")
Expand Down
5 changes: 0 additions & 5 deletions src/scikit_build_core/settings/documentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import ast
import dataclasses
import inspect
import sys
import textwrap
from pathlib import Path
from typing import TYPE_CHECKING
Expand All @@ -24,10 +23,6 @@ def __dir__() -> list[str]:


def _get_value(value: ast.expr) -> str:
if sys.version_info < (3, 8):
assert isinstance(value, ast.Str)
return value.s

assert isinstance(value, ast.Constant)
assert isinstance(value.value, str)
return value.value
Expand Down

0 comments on commit 06bfc2e

Please sign in to comment.