Skip to content

Commit f1cab1e

Browse files
authored
Merge branch 'master' into more-typevartuple-inference
2 parents 15f5ba6 + de2f375 commit f1cab1e

File tree

747 files changed

+42180
-17446
lines changed

Some content is hidden

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

747 files changed

+42180
-17446
lines changed

.github/ISSUE_TEMPLATE/crash.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ labels: "crash"
1515

1616
**Traceback**
1717

18-
```
18+
```python-traceback
1919
(Insert traceback and other messages from mypy here -- use `--show-traceback`.)
2020
```
2121

@@ -25,6 +25,11 @@ labels: "crash"
2525
appreciated. We also very much appreciate it if you try to narrow the
2626
source down to a small stand-alone example.)
2727

28+
```python
29+
# Ideally, a small sample program that demonstrates the problem.
30+
# Or even better, a reproducible playground link https://mypy-play.net/ (use the "Gist" button)
31+
```
32+
2833
**Your Environment**
2934

3035
<!-- Include as many relevant details about the environment you experienced the bug in -->

.github/workflows/docs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
# so it's important to do the docs build on all PRs touching mypy/errorcodes.py
1313
# in case somebody's adding a new error code without any docs
1414
- 'mypy/errorcodes.py'
15+
# Part of the documentation is automatically generated from the options
16+
# definitions in mypy/main.py
17+
- 'mypy/main.py'
1518
- 'mypyc/doc/**'
1619
- '**/*.rst'
1720
- '**/*.md'
@@ -41,7 +44,7 @@ jobs:
4144
with:
4245
python-version: '3.12'
4346
- name: Install tox
44-
run: pip install tox==4.21.2
47+
run: pip install tox==4.26.0
4548
- name: Setup tox environment
4649
run: tox run -e ${{ env.TOXENV }} --notest
4750
- name: Test

.github/workflows/mypy_primer.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
strategy:
3030
matrix:
31-
shard-index: [0, 1, 2, 3, 4]
31+
shard-index: [0, 1, 2, 3, 4, 5]
3232
fail-fast: false
3333
timeout-minutes: 60
3434
steps:
@@ -63,10 +63,11 @@ jobs:
6363
mypy_primer \
6464
--repo mypy_to_test \
6565
--new $GITHUB_SHA --old base_commit \
66-
--num-shards 5 --shard-index ${{ matrix.shard-index }} \
66+
--num-shards 6 --shard-index ${{ matrix.shard-index }} \
6767
--debug \
6868
--additional-flags="--debug-serialize" \
6969
--output concise \
70+
--mypy-install-librt \
7071
| tee diff_${{ matrix.shard-index }}.txt
7172
) || [ $? -eq 1 ]
7273
- if: ${{ matrix.shard-index == 0 }}

.github/workflows/test.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,16 @@ jobs:
3737
toxenv: py
3838
tox_extra_args: "-n 4"
3939
test_mypyc: true
40-
- name: Test suite with py39-windows-64
41-
python: '3.9'
42-
os: windows-latest
43-
toxenv: py39
44-
tox_extra_args: "-n 4"
4540
- name: Test suite with py310-ubuntu
4641
python: '3.10'
4742
os: ubuntu-24.04-arm
4843
toxenv: py
4944
tox_extra_args: "-n 4"
50-
- name: Test suite with py311-ubuntu, mypyc-compiled
45+
- name: Test suite with py311-ubuntu
5146
python: '3.11'
5247
os: ubuntu-24.04-arm
5348
toxenv: py
5449
tox_extra_args: "-n 4"
55-
test_mypyc: true
5650
- name: Test suite with py312-ubuntu, mypyc-compiled
5751
python: '3.12'
5852
os: ubuntu-24.04-arm
@@ -65,14 +59,19 @@ jobs:
6559
toxenv: py
6660
tox_extra_args: "-n 4"
6761
test_mypyc: true
62+
- name: Test suite with py313-windows-64
63+
python: '3.13'
64+
os: windows-latest
65+
toxenv: py
66+
tox_extra_args: "-n 4"
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 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 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

0 commit comments

Comments
 (0)