feat: drop <3.7 (#461)

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

Author: henryiii

.github/workflows/build.yml

@@ -153,49 +153,6 @@ jobs:
           name: Wheel-manylinux2010-${{ matrix.arch }}
           path: ./wheelhouse/*.whl
 
-  test_old_pythons:
-    name: Test wheel with python ${{ matrix.python }}
-    needs: [build_wheels]
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python: ["2.7", "3.5"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        if: matrix.python != '2.7'
-        name: Install Python ${{ matrix.python }}
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: Install Python ${{ matrix.python }}
-        if: matrix.python == '2.7'
-        shell: bash
-        run: |
-          nuget install python2 -Version 2.7.18 -OutputDirectory '${{ runner.temp }}'
-          echo '${{ runner.temp }}\python2.2.7.18\tools' >> $GITHUB_PATH
-
-      - name: Install dependencies
-        shell: bash
-        run: |
-          python -m pip install -U pip
-          python -m pip install pytest pytest-cov
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: Wheel-Windows-AMD64
-          path: wheelhouse
-
-      - name: Install wheel
-        shell: bash
-        run: |
-          python -m pip -V
-          python -m pip install "$(find wheelhouse -name '*.whl')[test]"
-
-      - name: Test installed SDist
-        run: python -m pytest ./tests
-
   build_sdist:
     name: Build source distribution
     needs: [lint]
@@ -253,7 +210,7 @@ jobs:
 
   check_dist:
     name: Check dist
-    needs: [build_wheels, build_manylinux2010_wheels, test_old_pythons, build_sdist, test_sdist]
+    needs: [build_wheels, build_manylinux2010_wheels, build_sdist, test_sdist]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v4

.pre-commit-config.yaml

@@ -16,7 +16,6 @@ repos:
   - id: mixed-line-ending
   - id: requirements-txt-fixer
   - id: trailing-whitespace
-  - id: fix-encoding-pragma
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: "v0.2.2"

noxfile.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import argparse
 from pathlib import Path
 
@@ -10,7 +9,6 @@
     "MACOSX_DEPLOYMENT_TARGET": "10.10",
 }
 
-
 built = ""
 
 

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
     "Typing :: Typed"
 ]
 dynamic = ["version"]
-# requires-python = ">=3.7"  this is only required to build the wheel. We're still compatible with python 2.7
+requires-python = ">=3.7"
 
 [project.urls]
 Homepage = "https://cmake.org"
@@ -53,7 +53,7 @@ build-dir = "build/{wheel_tag}"
 metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
 ninja.make-fallback = false
 sdist.include = ["src/cmake/_version.py"]
-wheel.py-api = "py2.py3"
+wheel.py-api = "py3"
 wheel.expand-macos-universal-tags = true
 wheel.install-dir = "cmake/data"
 
@@ -120,14 +120,11 @@ extend-select = [
 ]
 ignore = [
   "PLR09",  # Too many X
-  "RUF005", # Python 3 needed
-  "B904",   # Python 3 needed
-  "SIM105", # Python 3 needed
 ]
 exclude = ["src/cmake/_version.py"]
 flake8-unused-arguments.ignore-variadic-names = true
 
 [tool.ruff.lint.per-file-ignores]
 "docs/conf.py" = ["E402"]
 "*.pyi" = ["ARG001"]
-"noxfile.py" = ["PLW0603"] # Could be fixed if Python 2 dropped
+"noxfile.py" = ["PLW0603"]

scripts/update_cmake_version.py

@@ -17,7 +17,7 @@
     raise SystemExit(
         "requests not available: "
         "consider installing it running 'pip install requests'"
-    )
+    ) from None
 
 ROOT_DIR = os.path.join(os.path.dirname(__file__), "..")
 

scripts/update_openssl_version.py

@@ -16,7 +16,7 @@
     raise SystemExit(
         "requests not available: "
         "consider installing it running 'pip install requests'"
-    )
+    ) from None
 
 ROOT_DIR = os.path.join(os.path.dirname(__file__), "..")
 

src/cmake/__init__.py

@@ -1,13 +1,11 @@
-# -*- coding: utf-8 -*-
 import os
 import subprocess
 import sys
 
-if sys.version_info >= (3, 4):
-    if sys.version_info < (3, 10):
-        from importlib_metadata import distribution
-    else:
-        from importlib.metadata import distribution
+if sys.version_info < (3, 10):
+    from importlib_metadata import distribution
+else:
+    from importlib.metadata import distribution
 
 from ._version import version as __version__
 
@@ -18,20 +16,13 @@ def __dir__():
     return __all__
 
 
-if sys.version_info >= (3, 4):
-    cmake_executable_path = None
-    for script in distribution("cmake").files:
-        if str(script).startswith("cmake/data/bin/cmake"):
-            if sys.version_info < (3, 6):
-                # pre-3.6 behavior is strict
-                resolved_script = script.locate().resolve()
-            else:
-                resolved_script = script.locate().resolve(strict=True)
-            cmake_executable_path = resolved_script.parents[1]
-            break
-    CMAKE_DATA = str(cmake_executable_path) if cmake_executable_path else None
-else:
-    CMAKE_DATA = os.path.join(os.path.dirname(__file__), "data")
+cmake_executable_path = None
+for script in distribution("cmake").files:
+    if str(script).startswith("cmake/data/bin/cmake"):
+        resolved_script = script.locate().resolve(strict=True)
+        cmake_executable_path = resolved_script.parents[1]
+        break
+CMAKE_DATA = str(cmake_executable_path) if cmake_executable_path else None
 
 assert CMAKE_DATA is not None
 assert os.path.exists(CMAKE_DATA)
@@ -42,7 +33,7 @@ def __dir__():
 
 
 def _program(name, args):
-    return subprocess.call([os.path.join(CMAKE_BIN_DIR, name)] + args, close_fds=False)
+    return subprocess.call([os.path.join(CMAKE_BIN_DIR, name), *args], close_fds=False)
 
 
 def cmake():

tests/test_cmake.py

@@ -21,7 +21,7 @@
 
 def _run(program, args):
     func = getattr(cmake, program)
-    args = ["%s.py" % program] + args
+    args = [f"{program}.py", *args]
     with push_argv(args), pytest.raises(SystemExit) as excinfo:
         func()
     assert excinfo.value.code == 0