Skip to content

Commit db6c515

Browse files
authored
Merge branch 'python:master' into patch-1
2 parents 2a2b696 + ad57093 commit db6c515

File tree

597 files changed

+24646
-11449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

597 files changed

+24646
-11449
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
python-version: '3.12'
4343
- name: Install tox
44-
run: pip install tox==4.21.2
44+
run: pip install tox==4.26.0
4545
- name: Setup tox environment
4646
run: tox run -e ${{ env.TOXENV }} --notest
4747
- name: Test

.github/workflows/test.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ jobs:
4747
os: ubuntu-24.04-arm
4848
toxenv: py
4949
tox_extra_args: "-n 4"
50-
- name: Test suite with py311-ubuntu, mypyc-compiled
50+
- name: Test suite with py311-ubuntu
5151
python: '3.11'
5252
os: ubuntu-24.04-arm
5353
toxenv: py
5454
tox_extra_args: "-n 4"
55-
test_mypyc: true
5655
- name: Test suite with py312-ubuntu, mypyc-compiled
5756
python: '3.12'
5857
os: ubuntu-24.04-arm
@@ -66,13 +65,13 @@ jobs:
6665
tox_extra_args: "-n 4"
6766
test_mypyc: true
6867

69-
# - name: Test suite with py314-dev-ubuntu
70-
# python: '3.14-dev'
71-
# os: ubuntu-24.04-arm
72-
# toxenv: py
73-
# tox_extra_args: "-n 4"
74-
# allow_failure: true
75-
# test_mypyc: true
68+
- name: Test suite with py314-dev-ubuntu
69+
python: '3.14-dev'
70+
os: ubuntu-24.04-arm
71+
toxenv: py
72+
tox_extra_args: "-n 4"
73+
# allow_failure: true
74+
test_mypyc: true
7675

7776
- name: mypyc runtime tests with py39-macos
7877
python: '3.9.21'
@@ -115,6 +114,8 @@ jobs:
115114
FORCE_COLOR: ${{ !(startsWith(matrix.os, 'windows-') && startsWith(matrix.toxenv, 'py')) && 1 || 0 }}
116115
# Tox
117116
PY_COLORS: 1
117+
# Python -- Disable argparse help colors (3.14+)
118+
PYTHON_COLORS: 0
118119
# Mypy (see https://github.com/python/mypy/issues/7771)
119120
TERM: xterm-color
120121
MYPY_FORCE_COLOR: 1
@@ -167,7 +168,7 @@ jobs:
167168
echo debug build; python -c 'import sysconfig; print(bool(sysconfig.get_config_var("Py_DEBUG")))'
168169
echo os.cpu_count; python -c 'import os; print(os.cpu_count())'
169170
echo os.sched_getaffinity; python -c 'import os; print(len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
170-
pip install setuptools==75.1.0 tox==4.21.2
171+
pip install setuptools==75.1.0 tox==4.26.0
171172
172173
- name: Compiled with mypyc
173174
if: ${{ matrix.test_mypyc }}
@@ -230,7 +231,7 @@ jobs:
230231
default: 3.11.1
231232
command: python -c "import platform; print(f'{platform.architecture()=} {platform.machine()=}');"
232233
- name: Install tox
233-
run: pip install setuptools==75.1.0 tox==4.21.2
234+
run: pip install setuptools==75.1.0 tox==4.26.0
234235
- name: Setup tox environment
235236
run: tox run -e py --notest
236237
- name: Test

.pre-commit-config.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,23 @@ repos:
1111
- id: black
1212
exclude: '^(test-data/)'
1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.8.6
14+
rev: v0.11.4
1515
hooks:
1616
- id: ruff
1717
args: [--exit-non-zero-on-fix]
1818
- repo: https://github.com/python-jsonschema/check-jsonschema
19-
rev: 0.31.0
19+
rev: 0.32.1
2020
hooks:
2121
- id: check-github-workflows
2222
- id: check-github-actions
2323
- id: check-readthedocs
24+
- repo: https://github.com/codespell-project/codespell
25+
rev: v2.4.1
26+
hooks:
27+
- id: codespell
28+
args:
29+
- --ignore-words-list=HAX,ccompiler,ot,statics,whet,zar
30+
exclude: ^(mypy/test/|mypy/typeshed/|mypyc/test-data/|test-data/).+$
2431
- repo: https://github.com/rhysd/actionlint
2532
rev: v1.7.7
2633
hooks:
@@ -36,7 +43,7 @@ repos:
3643
# but the integration only works if shellcheck is installed
3744
- "github.com/wasilibs/go-shellcheck/cmd/[email protected]"
3845
- repo: https://github.com/woodruffw/zizmor-pre-commit
39-
rev: v1.0.1
46+
rev: v1.5.2
4047
hooks:
4148
- id: zizmor
4249
- repo: local

0 commit comments

Comments
 (0)