Skip to content

Commit 3e3d16d

Browse files
authored
Bump min Python version for GHA and fix spurious CI error (#4716)
2 parents e47994c + b9dd033 commit 3e3d16d

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ jobs:
6363
- platform: ubuntu-latest
6464
python: "3.10"
6565
distutils: stdlib
66-
# Python 3.8, 3.9 are on macos-13 but not macos-latest (macos-14-arm64)
67-
# https://github.com/actions/setup-python/issues/850
68-
# https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
69-
- {python: "3.8", platform: "macos-13"}
70-
exclude:
71-
- {python: "3.8", platform: "macos-latest"}
7266
runs-on: ${{ matrix.platform }}
7367
continue-on-error: ${{ matrix.python == '3.14' }}
7468
env:

.github/workflows/pyright.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
# https://blog.jaraco.com/efficient-use-of-ci-resources/
4343
matrix:
4444
python:
45-
- "3.8"
46-
- "3.12"
45+
- "3.9"
46+
- "3.13"
4747
platform:
4848
- ubuntu-latest
4949
runs-on: ${{ matrix.platform }}

mypy.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ disable_error_code =
2020

2121
# CI should test for all versions, local development gets hints for oldest supported
2222
# But our testing setup doesn't allow passing CLI arguments, so local devs have to set this manually.
23-
# python_version = 3.8
23+
# python_version = 3.9
2424

2525
exclude = (?x)(
2626
# Avoid scanning Python files in generated folders

pyrightconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"setuptools/_distutils",
1212
],
1313
// Our testing setup doesn't allow passing CLI arguments, so local devs have to set this manually.
14-
// "pythonVersion": "3.8",
14+
// "pythonVersion": "3.9",
1515
// For now we don't mind if mypy's `type: ignore` comments accidentally suppresses pyright issues
1616
"enableTypeIgnoreComments": true,
1717
"typeCheckingMode": "basic",

ruff.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# include pyproject.toml for requires-python (workaround astral-sh/ruff#10299)
2-
include = "pyproject.toml"
2+
include = ["pyproject.toml"]
33

44
exclude = [
55
"**/_vendor",

setuptools/tests/test_easy_install.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,6 +1407,10 @@ def test_use_correct_python_version_string(tmpdir, tmpdir_cwd, monkeypatch):
14071407
assert cmd.config_vars['py_version_nodot'] == '310'
14081408

14091409

1410+
@pytest.mark.xfail(
1411+
sys.platform == "darwin",
1412+
reason="https://github.com/pypa/setuptools/pull/4716#issuecomment-2447624418",
1413+
)
14101414
def test_editable_user_and_build_isolation(setup_context, monkeypatch, tmp_path):
14111415
"""`setup.py develop` should honor `--user` even under build isolation"""
14121416

0 commit comments

Comments
 (0)