fix: cleanup some changes

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

src/scikit_build_core/_logging.py

@@ -9,12 +9,12 @@
 import platform
 import sys
 from collections.abc import Mapping
-from typing import TYPE_CHECKING, Any, NoReturn
+from typing import TYPE_CHECKING, Any, Literal, NoReturn
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from ._compat.typing import Literal, Self
+    from ._compat.typing import Self
 
     StrMapping = Mapping[str, "Style"]
 else:

src/scikit_build_core/builder/sysconfig.py

@@ -5,7 +5,7 @@
 import sys
 import sysconfig
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal
 
 import packaging.tags
 
@@ -14,8 +14,6 @@
 if TYPE_CHECKING:
     from collections.abc import Mapping
 
-    from .._compat.typing import Literal
-
 __all__ = [
     "get_abi_flags",
     "get_cmake_platform",
@@ -169,7 +167,13 @@ def get_soabi(env: Mapping[str, str], *, abi3: bool = False) -> str:
     if setuptools_ext_suffix:
         return setuptools_ext_suffix.rsplit(".", 1)[0].lstrip(".")
 
-    ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
+    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")
 
     assert isinstance(ext_suffix, str)
     return ext_suffix.rsplit(".", 1)[0].lstrip(".")

src/scikit_build_core/program_search.py

@@ -6,7 +6,7 @@
 import subprocess
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, NamedTuple
+from typing import TYPE_CHECKING, Literal, NamedTuple
 
 from packaging.version import InvalidVersion, Version
 
@@ -18,7 +18,6 @@
 
     from packaging.specifiers import SpecifierSet
 
-    from ._compat.typing import Literal
 
 __all__ = [
     "Program",

src/scikit_build_core/settings/skbuild_overrides.py

@@ -5,7 +5,7 @@
 import re
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
 import packaging.tags
 from packaging.specifiers import SpecifierSet
@@ -28,8 +28,6 @@ def __dir__() -> list[str]:
 if TYPE_CHECKING:
     from collections.abc import Mapping
 
-    from .._compat.typing import Literal
-
 
 def strtobool(value: str) -> bool:
     """

tests/test_setuptools_pep517.py

@@ -1,3 +1,4 @@
+import importlib.metadata
 import tarfile
 import textwrap
 import zipfile
@@ -6,11 +7,10 @@
 import pytest
 from packaging.version import Version
 
-from scikit_build_core._compat.importlib import metadata
 from scikit_build_core.setuptools.build_meta import build_sdist, build_wheel
 
 pytestmark = pytest.mark.setuptools
-setuptools_version = Version(metadata.version("setuptools"))
+setuptools_version = Version(importlib.metadata.version("setuptools"))
 
 
 @pytest.mark.usefixtures("package_simple_setuptools_ext")