drop python<=3.7 support

According to https://endoflife.date/python python 3.7 has been EOSed
27 Jun 2023.
Filter all code over `pyupgrade --py38-plus`.

Signed-off-by: Tomasz Kłoczko <[email protected]>

Author: kloczek

src/scikit_build_core/_compat/importlib/metadata.py

@@ -3,12 +3,8 @@
 import sys
 import typing
 
-if sys.version_info < (3, 8):
-    import importlib_metadata as _metadata
-    from importlib_metadata import PathDistribution, version
-else:
-    import importlib.metadata as _metadata
-    from importlib.metadata import PathDistribution, version
+import importlib.metadata as _metadata
+from importlib.metadata import PathDistribution, version
 
 
 if typing.TYPE_CHECKING:

src/scikit_build_core/_compat/typing.py

@@ -3,13 +3,7 @@
 import sys
 import typing
 
-if sys.version_info < (3, 8):
-    from typing_extensions import (
-        Literal,
-        Protocol,
-    )
-else:
-    from typing import Literal, Protocol
+from typing import Literal, Protocol
 
 if sys.version_info < (3, 9):
     from typing_extensions import Annotated, get_args, get_origin

src/scikit_build_core/_logging.py

@@ -37,10 +37,7 @@ def __repr__(self) -> str:
         )
 
 
-if sys.version_info < (3, 8):
-    opts: Any = {}
-else:
-    opts: Any = {"stacklevel": 2}
+opts: Any = {"stacklevel": 2}
 
 
 class ScikitBuildLogger:

tests/conftest.py

@@ -12,12 +12,8 @@
 
 import virtualenv as _virtualenv
 
-if sys.version_info < (3, 8):
-    import importlib_metadata as metadata
-    from typing_extensions import Literal, overload
-else:
-    from importlib import metadata
-    from typing import Literal, overload
+from importlib import metadata
+from typing import Literal, overload
 
 if sys.version_info < (3, 11):
     import tomli as tomllib

tests/test_custom_modules.py

@@ -23,10 +23,9 @@ def test_ep(isolated):
     contents = Path(script).read_text()
     assert contents.startswith(f"#!{pysys}")
 
-    if sys.version_info >= (3, 8):
-        assert (
-            isolated.execute(
-                "from importlib import metadata; print(metadata.version('custom_modules'), end='')"
-            )
-            == "2.3.4"
+    assert (
+        isolated.execute(
+            "from importlib import metadata; print(metadata.version('custom_modules'), end='')"
         )
+        == "2.3.4"
+    )

tests/test_dynamic_metadata.py

@@ -236,24 +236,23 @@ def test_pep517_wheel(virtualenv):
     assert wheel == dist / out
 
     virtualenv.install(wheel)
-    if sys.version_info >= (3, 8):
-        license = virtualenv.execute(
-            "from importlib.metadata import metadata; print(metadata('dynamic')['License'])"
-        )
-        assert license == "MIT License"
-
-        with wheel.open("rb") as f:
-            p = zipfile.Path(f)
-            file_names = {x.name for x in p.iterdir()}
-            dynamic_pkg = {x.name for x in p.joinpath("dynamic").iterdir()}
-
-        filtered_pkg = {x for x in dynamic_pkg if not x.startswith("_module")}
-
-        assert len(filtered_pkg) == len(dynamic_pkg) - 1
-        assert {"dynamic-0.0.2.dist-info", "dynamic"} == file_names
-        assert {
-            "__init__.py",
-        } == filtered_pkg
+    license = virtualenv.execute(
+        "from importlib.metadata import metadata; print(metadata('dynamic')['License'])"
+    )
+    assert license == "MIT License"
+
+    with wheel.open("rb") as f:
+        p = zipfile.Path(f)
+        file_names = {x.name for x in p.iterdir()}
+        dynamic_pkg = {x.name for x in p.joinpath("dynamic").iterdir()}
+
+    filtered_pkg = {x for x in dynamic_pkg if not x.startswith("_module")}
+
+    assert len(filtered_pkg) == len(dynamic_pkg) - 1
+    assert {"dynamic-0.0.2.dist-info", "dynamic"} == file_names
+    assert {
+        "__init__.py",
+    } == filtered_pkg
 
     version = virtualenv.execute("from dynamic import square; print(square(2))")
     assert version == "4.0"

tests/test_fortran.py

@@ -50,18 +50,17 @@ def test_pep517_wheel(tmp_path, monkeypatch, virtualenv):
     assert wheel == dist / out
     print(wheel)
 
-    if sys.version_info >= (3, 8):
-        with wheel.open("rb") as f:
-            p = zipfile.Path(f)
-            file_names = [p.name for p in p.iterdir()]
+    with wheel.open("rb") as f:
+        p = zipfile.Path(f)
+        file_names = [p.name for p in p.iterdir()]
 
-        assert len(file_names) == 2
-        assert "fibby-0.0.1.dist-info" in file_names
-        file_names.remove("fibby-0.0.1.dist-info")
-        (so_file,) = file_names
+    assert len(file_names) == 2
+    assert "fibby-0.0.1.dist-info" in file_names
+    file_names.remove("fibby-0.0.1.dist-info")
+    (so_file,) = file_names
 
-        assert so_file.startswith("fibby")
-        print("SOFILE:", so_file)
+    assert so_file.startswith("fibby")
+    print("SOFILE:", so_file)
 
     virtualenv.install(wheel)
 

tests/test_pyproject_abi3.py

@@ -40,30 +40,29 @@ def test_abi3_wheel(tmp_path, monkeypatch, virtualenv):
     else:
         assert "-cp37-abi3-" not in out
 
-    if sys.version_info >= (3, 8):
-        with wheel.open("rb") as f:
-            p = zipfile.Path(f)
-            file_names = [p.name for p in p.iterdir()]
+    with wheel.open("rb") as f:
+        p = zipfile.Path(f)
+        file_names = [p.name for p in p.iterdir()]
 
-        assert len(file_names) == 2
-        assert "abi3_example-0.0.1.dist-info" in file_names
-        file_names.remove("abi3_example-0.0.1.dist-info")
-        (so_file,) = file_names
+    assert len(file_names) == 2
+    assert "abi3_example-0.0.1.dist-info" in file_names
+    file_names.remove("abi3_example-0.0.1.dist-info")
+    (so_file,) = file_names
 
-        if sysconfig.get_platform().startswith("win"):
-            if sys.implementation.name == "cpython":
-                assert so_file == "abi3_example.pyd"
-            else:
-                assert so_file.endswith(".pyd")
-        elif sys.platform.startswith("cygwin"):
-            if abi3:
-                assert so_file == "abi3_example.abi3.dll"
-            else:
-                assert so_file != "abi3_example.abi3.dll"
-        elif abi3:
-            assert so_file == "abi3_example.abi3.so"
+    if sysconfig.get_platform().startswith("win"):
+        if sys.implementation.name == "cpython":
+            assert so_file == "abi3_example.pyd"
         else:
-            assert so_file != "abi3_example.abi3.so"
+            assert so_file.endswith(".pyd")
+    elif sys.platform.startswith("cygwin"):
+        if abi3:
+            assert so_file == "abi3_example.abi3.dll"
+        else:
+            assert so_file != "abi3_example.abi3.dll"
+    elif abi3:
+        assert so_file == "abi3_example.abi3.so"
+    else:
+        assert so_file != "abi3_example.abi3.so"
 
     virtualenv.install(wheel)
 

tests/test_pyproject_extra_dirs.py

@@ -27,33 +27,32 @@ def test_pep517_wheel_extra_dirs(monkeypatch):
     (wheel,) = dist.glob("cmake_dirs-0.0.1-*.whl")
     assert wheel == dist / out
 
-    if sys.version_info >= (3, 8):
-        with wheel.open("rb") as f:
-            p = zipfile.Path(f)
-            file_names = {p.name for p in p.iterdir()}
-            data_dir = {p.name for p in p.joinpath("cmake_dirs-0.0.1.data").iterdir()}
-            package = {p.name for p in p.joinpath("cmake_dirs").iterdir()}
-            data = {p.name for p in p.joinpath("cmake_dirs-0.0.1.data/data").iterdir()}
-            headers = {
-                p.name for p in p.joinpath("cmake_dirs-0.0.1.data/headers").iterdir()
-            }
-            scripts = {
-                p.name for p in p.joinpath("cmake_dirs-0.0.1.data/scripts").iterdir()
-            }
+    with wheel.open("rb") as f:
+        p = zipfile.Path(f)
+        file_names = {p.name for p in p.iterdir()}
+        data_dir = {p.name for p in p.joinpath("cmake_dirs-0.0.1.data").iterdir()}
+        package = {p.name for p in p.joinpath("cmake_dirs").iterdir()}
+        data = {p.name for p in p.joinpath("cmake_dirs-0.0.1.data/data").iterdir()}
+        headers = {
+            p.name for p in p.joinpath("cmake_dirs-0.0.1.data/headers").iterdir()
+        }
+        scripts = {
+            p.name for p in p.joinpath("cmake_dirs-0.0.1.data/scripts").iterdir()
+        }
 
-        assert {
-            "cmake_dirs-0.0.1.dist-info",
-            "cmake_dirs-0.0.1.data",
-            "cmake_dirs",
-            "random_file.py",
-        } == file_names
+    assert {
+        "cmake_dirs-0.0.1.dist-info",
+        "cmake_dirs-0.0.1.data",
+        "cmake_dirs",
+        "random_file.py",
+    } == file_names
 
-        assert data_dir == {"data", "headers", "scripts"}
+    assert data_dir == {"data", "headers", "scripts"}
 
-        assert package == {"main.py"}
-        assert data == {"in_data.txt"}
-        assert headers == {"in_headers.h"}
-        assert scripts == {"in_scripts.py"}
+    assert package == {"main.py"}
+    assert data == {"in_data.txt"}
+    assert headers == {"in_headers.h"}
+    assert scripts == {"in_scripts.py"}
 
 
 @pytest.mark.usefixtures("package_filepath_pure")

tests/test_pyproject_pep517.py

@@ -198,31 +198,30 @@ def test_pep517_wheel(virtualenv):
     (wheel,) = dist.glob("cmake_example-0.0.1-*.whl")
     assert wheel == dist / out
 
-    if sys.version_info >= (3, 8):
-        with wheel.open("rb") as f:
-            p = zipfile.Path(f)
-            file_names = [p.name for p in p.iterdir()]
-            metadata = p.joinpath("cmake_example-0.0.1.dist-info/METADATA").read_text()
-            entry_points = p.joinpath(
-                "cmake_example-0.0.1.dist-info/entry_points.txt"
-            ).read_text()
-            assert p.joinpath("cmake_example-0.0.1.dist-info/licenses/LICENSE").exists()
-
-        assert len(file_names) == 2
-        assert "cmake_example-0.0.1.dist-info" in file_names
-        file_names.remove("cmake_example-0.0.1.dist-info")
-        (so_file,) = file_names
-
-        assert so_file.startswith("cmake_example")
-        print("SOFILE:", so_file)
-
-        print(entry_points == ENTRYPOINTS)
-        assert 'Requires-Dist: pytest>=6.0; extra == "test"' in metadata
-        assert "Metadata-Version: 2.1" in metadata
-        assert "Name: CMake.Example" in metadata
-        assert "Version: 0.0.1" in metadata
-        assert "Requires-Python: >=3.7" in metadata
-        assert "Provides-Extra: test" in metadata
+    with wheel.open("rb") as f:
+        p = zipfile.Path(f)
+        file_names = [p.name for p in p.iterdir()]
+        metadata = p.joinpath("cmake_example-0.0.1.dist-info/METADATA").read_text()
+        entry_points = p.joinpath(
+            "cmake_example-0.0.1.dist-info/entry_points.txt"
+        ).read_text()
+        assert p.joinpath("cmake_example-0.0.1.dist-info/licenses/LICENSE").exists()
+
+    assert len(file_names) == 2
+    assert "cmake_example-0.0.1.dist-info" in file_names
+    file_names.remove("cmake_example-0.0.1.dist-info")
+    (so_file,) = file_names
+
+    assert so_file.startswith("cmake_example")
+    print("SOFILE:", so_file)
+
+    print(entry_points == ENTRYPOINTS)
+    assert 'Requires-Dist: pytest>=6.0; extra == "test"' in metadata
+    assert "Metadata-Version: 2.1" in metadata
+    assert "Name: CMake.Example" in metadata
+    assert "Version: 0.0.1" in metadata
+    assert "Requires-Python: >=3.7" in metadata
+    assert "Provides-Extra: test" in metadata
 
     virtualenv.install(wheel)
 
@@ -246,39 +245,38 @@ def test_pep517_wheel_source_dir(virtualenv):
     (wheel,) = dist.glob("cmake_example-0.0.1-*.whl")
     assert wheel == dist / out
 
-    if sys.version_info >= (3, 8):
-        with wheel.open("rb") as f:
-            p = zipfile.Path(f)
-            file_names = [p.name for p in p.iterdir()]
-            metadata = p.joinpath("cmake_example-0.0.1.dist-info/METADATA").read_text()
-            wheel_metadata = p.joinpath(
-                "cmake_example-0.0.1.dist-info/WHEEL"
-            ).read_text()
-            entry_points = p.joinpath(
-                "cmake_example-0.0.1.dist-info/entry_points.txt"
-            ).read_text()
-            assert p.joinpath("cmake_example-0.0.1.dist-info/licenses/LICENSE").exists()
-
-        assert len(file_names) == 2
-        assert "cmake_example-0.0.1.dist-info" in file_names
-        file_names.remove("cmake_example-0.0.1.dist-info")
-        (so_file,) = file_names
-
-        assert so_file.startswith("cmake_example")
-        print("SOFILE:", so_file)
-
-        print(entry_points == ENTRYPOINTS)
-        assert 'Requires-Dist: pytest>=6.0; extra == "test"' in metadata
-        assert "Metadata-Version: 2.1" in metadata
-        assert "Name: CMake.Example" in metadata
-        assert "Version: 0.0.1" in metadata
-        assert "Requires-Python: >=3.7" in metadata
-        assert "Provides-Extra: test" in metadata
-
-        assert "Build: 1foo" in wheel_metadata
-        assert "Wheel-Version: 1.0" in wheel_metadata
-        assert "Generator: scikit-build" in wheel_metadata
-        assert "Root-Is-Purelib: false" in wheel_metadata
+    with wheel.open("rb") as f:
+        p = zipfile.Path(f)
+        file_names = [p.name for p in p.iterdir()]
+        metadata = p.joinpath("cmake_example-0.0.1.dist-info/METADATA").read_text()
+        wheel_metadata = p.joinpath(
+            "cmake_example-0.0.1.dist-info/WHEEL"
+        ).read_text()
+        entry_points = p.joinpath(
+            "cmake_example-0.0.1.dist-info/entry_points.txt"
+        ).read_text()
+        assert p.joinpath("cmake_example-0.0.1.dist-info/licenses/LICENSE").exists()
+
+    assert len(file_names) == 2
+    assert "cmake_example-0.0.1.dist-info" in file_names
+    file_names.remove("cmake_example-0.0.1.dist-info")
+    (so_file,) = file_names
+
+    assert so_file.startswith("cmake_example")
+    print("SOFILE:", so_file)
+
+    print(entry_points == ENTRYPOINTS)
+    assert 'Requires-Dist: pytest>=6.0; extra == "test"' in metadata
+    assert "Metadata-Version: 2.1" in metadata
+    assert "Name: CMake.Example" in metadata
+    assert "Version: 0.0.1" in metadata
+    assert "Requires-Python: >=3.7" in metadata
+    assert "Provides-Extra: test" in metadata
+
+    assert "Build: 1foo" in wheel_metadata
+    assert "Wheel-Version: 1.0" in wheel_metadata
+    assert "Generator: scikit-build" in wheel_metadata
+    assert "Root-Is-Purelib: false" in wheel_metadata
 
     virtualenv.install(wheel)