Bump min Python version for GHA and fix spurious CI error (#4716)

pypa · Oct 30, 2024 · 3e3d16d · 3e3d16d
2 parents e47994c + b9dd033
commit 3e3d16d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -63,12 +63,6 @@ jobs:
         - platform: ubuntu-latest
           python: "3.10"
           distutils: stdlib
-        # Python 3.8, 3.9 are on macos-13 but not macos-latest (macos-14-arm64)
-        # https://github.com/actions/setup-python/issues/850
-        # https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
-        - {python: "3.8", platform: "macos-13"}
-        exclude:
-        - {python: "3.8", platform: "macos-latest"}
     runs-on: ${{ matrix.platform }}
     continue-on-error: ${{ matrix.python == '3.14' }}
     env:

diff --git a/.github/workflows/pyright.yml b/.github/workflows/pyright.yml
@@ -42,8 +42,8 @@ jobs:
       # https://blog.jaraco.com/efficient-use-of-ci-resources/
       matrix:
         python:
-          - "3.8"
-          - "3.12"
+          - "3.9"
+          - "3.13"
         platform:
           - ubuntu-latest
     runs-on: ${{ matrix.platform }}

diff --git a/mypy.ini b/mypy.ini
@@ -20,7 +20,7 @@ disable_error_code =
 
 # CI should test for all versions, local development gets hints for oldest supported
 # But our testing setup doesn't allow passing CLI arguments, so local devs have to set this manually.
-# python_version = 3.8
+# python_version = 3.9
 
 exclude = (?x)(
 	# Avoid scanning Python files in generated folders

diff --git a/pyrightconfig.json b/pyrightconfig.json
@@ -11,7 +11,7 @@
 		"setuptools/_distutils",
 	],
 	// Our testing setup doesn't allow passing CLI arguments, so local devs have to set this manually.
-	// "pythonVersion": "3.8",
+	// "pythonVersion": "3.9",
 	// For now we don't mind if mypy's `type: ignore` comments accidentally suppresses pyright issues
 	"enableTypeIgnoreComments": true,
 	"typeCheckingMode": "basic",

diff --git a/ruff.toml b/ruff.toml
@@ -1,5 +1,5 @@
 # include pyproject.toml for requires-python (workaround astral-sh/ruff#10299)
-include = "pyproject.toml"
+include = ["pyproject.toml"]
 
 exclude = [
 	"**/_vendor",

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
@@ -1407,6 +1407,10 @@ def test_use_correct_python_version_string(tmpdir, tmpdir_cwd, monkeypatch):
     assert cmd.config_vars['py_version_nodot'] == '310'
 
 
+@pytest.mark.xfail(
+    sys.platform == "darwin",
+    reason="https://github.com/pypa/setuptools/pull/4716#issuecomment-2447624418",
+)
 def test_editable_user_and_build_isolation(setup_context, monkeypatch, tmp_path):
     """`setup.py develop` should honor `--user` even under build isolation"""