Skip to content

Commit a64dfff

Browse files
authored
[CI] Remove some Python 3.14 workarounds (#14651)
1 parent 61107f2 commit a64dfff

4 files changed

Lines changed: 9 additions & 18 deletions

File tree

.github/workflows/daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
matrix:
3737
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
38-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
38+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
3939
fail-fast: false
4040

4141
steps:

.github/workflows/stubtest_stdlib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
matrix:
3333
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
34-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
34+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
3535
fail-fast: false
3636

3737
steps:

.github/workflows/tests.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ jobs:
4242
strategy:
4343
matrix:
4444
platform: ["linux", "win32", "darwin"]
45-
# TODO (2025-05-10) "3.13.2" should be "3.14-dev", see below.
46-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.13.2"]
45+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
4746
fail-fast: false
4847
steps:
4948
- uses: actions/checkout@v4
5049
- uses: actions/setup-python@v5
5150
with:
5251
python-version: ${{ matrix.python-version }}
52+
allow-prereleases: true
5353
- uses: astral-sh/setup-uv@v6
5454
with:
5555
version-file: "requirements-tests.txt"
@@ -63,15 +63,9 @@ jobs:
6363
fi
6464
- name: Run mypy_test.py
6565
run: |
66-
# TODO: (2025-05-10) This is a bad hack to work around mypy crashing
67-
# when running on Python 3.14. See https://github.com/python/mypy/pull/19020.
68-
if [[ "${{ matrix.python-version }}" == "3.13.2" ]]; then
69-
MYPY_PY_VERSION="3.14"
70-
else
71-
# python-version can sometimes be pinned to a specific version or to "-dev", but
72-
# mypy understands only X.Y version numbers.
73-
MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
74-
fi
66+
# python-version can sometimes be pinned to a specific version or to "-dev", but
67+
# mypy understands only X.Y version numbers.
68+
MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
7569
python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${MYPY_PY_VERSION}
7670
7771
regression-tests:

requirements-tests.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ mypy==1.17.1
44
pyright==1.1.404
55

66
# Libraries used by our various scripts.
7-
# TODO (2025-05-09): Installing this on Python 3.14 on Windows fails at
8-
# the moment.
9-
aiohttp==3.12.14; python_version < "3.14"
7+
aiohttp==3.12.15
108
# TODO (2025-05-09): No wheels exist for Python 3.14 yet, slowing down CI
119
# considerably and prone to fail.
1210
grpcio-tools>=1.66.2; python_version < "3.14" # For grpc_tools.protoc
@@ -16,8 +14,7 @@ pathspec>=0.11.1
1614
pre-commit
1715
# Required by create_baseline_stubs.py. Must match .pre-commit-config.yaml.
1816
ruff==0.12.2
19-
# TODO (2025-05-07): Dependency libcst doesn't support Python 3.14 yet.
20-
stubdefaulter==0.1.0; python_version < "3.14"
17+
stubdefaulter==0.1.0
2118
termcolor>=2.3
2219
tomli==2.2.1; python_version < "3.11"
2320
tomlkit==0.13.3

0 commit comments

Comments
 (0)