Skip to content

Commit 7dcfbe4

Browse files
Merge branch 'master' into mi
2 parents f767655 + 1c815c2 commit 7dcfbe4

File tree

515 files changed

+43546
-6588
lines changed

Some content is hidden

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

515 files changed

+43546
-6588
lines changed

.github/workflows/test.yml

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
# This is broken. See
9595
# - https://github.com/python/mypy/issues/17819
9696
# - https://github.com/python/mypy/pull/17822
97-
# - name: mypyc runtime tests with py38-debug-build-ubuntu
98-
# python: '3.9.21'
97+
# - name: mypyc runtime tests with py310-debug-build-ubuntu
98+
# python: '3.10'
9999
# os: ubuntu-latest
100100
# toxenv: py
101101
# tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py"
@@ -112,6 +112,11 @@ jobs:
112112
toxenv: py
113113
tox_extra_args: "-n 4 --mypy-num-workers=4 mypy/test/testcheck.py"
114114
test_mypyc: true
115+
- name: Parallel tests with py314-windows-64, interpreted
116+
python: '3.14'
117+
os: windows-latest
118+
toxenv: py
119+
tox_extra_args: "-n 2 --mypy-num-workers=2 mypy/test/testcheck.py -k 'incremental or modules or classes'"
115120

116121
- name: Type check our own code (py310-ubuntu)
117122
python: '3.10'
@@ -152,24 +157,15 @@ jobs:
152157
with:
153158
persist-credentials: false
154159

155-
- name: Debug build
156-
if: ${{ matrix.debug_build }}
157-
run: |
158-
PYTHONVERSION=${{ matrix.python }}
159-
PYTHONDIR=~/python-debug/python-$PYTHONVERSION
160-
VENV=$PYTHONDIR/env
161-
./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
162-
# TODO: does this do anything? env vars aren't passed to the next step right
163-
source $VENV/bin/activate
164160
- name: Latest dev build
165161
if: ${{ endsWith(matrix.python, '-dev') }}
166162
run: |
167163
git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch $( echo ${{ matrix.python }} | sed 's/-dev//' )
168164
cd /tmp/cpython
169165
echo git rev-parse HEAD; git rev-parse HEAD
170166
git show --no-patch
171-
sudo apt-get update
172-
sudo apt-get install -y --no-install-recommends \
167+
sudo apt-get update -q
168+
sudo apt-get install -q -y --no-install-recommends \
173169
build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
174170
libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
175171
./configure --prefix=/opt/pythondev
@@ -178,6 +174,23 @@ jobs:
178174
sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
179175
sudo ln -s /opt/pythondev/bin/pip3 /opt/pythondev/bin/pip
180176
echo "/opt/pythondev/bin" >> $GITHUB_PATH
177+
- name: Debug build
178+
if: ${{ matrix.debug_build }}
179+
run: |
180+
git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch ${{ matrix.python }}
181+
cd /tmp/cpython
182+
echo git rev-parse HEAD; git rev-parse HEAD
183+
git show --no-patch
184+
sudo apt-get update -q
185+
sudo apt-get install -q -y --no-install-recommends \
186+
build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
187+
libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
188+
./configure CFLAGS="-DPy_DEBUG -DPy_TRACE_REFS -DPYMALLOC_DEBUG" --with-pydebug -with-trace-refs --prefix=/opt/pythondev
189+
make -j$(nproc)
190+
sudo make install
191+
sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
192+
sudo ln -s /opt/pythondev/bin/pip3 /opt/pythondev/bin/pip
193+
echo "/opt/pythondev/bin" >> $GITHUB_PATH
181194
- uses: actions/setup-python@v5
182195
if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}
183196
with:
@@ -192,7 +205,7 @@ jobs:
192205
echo debug build; python -c 'import sysconfig; print(bool(sysconfig.get_config_var("Py_DEBUG")))'
193206
echo os.cpu_count; python -c 'import os; print(os.cpu_count())'
194207
echo os.sched_getaffinity; python -c 'import os; print(len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
195-
pip install setuptools==75.1.0 tox==4.26.0
208+
pip install tox==4.26.0
196209
197210
- name: Compiled with mypyc
198211
if: ${{ matrix.test_mypyc }}
@@ -255,7 +268,7 @@ jobs:
255268
default: 3.11.1
256269
command: python -c "import platform; print(f'{platform.architecture()=} {platform.machine()=}');"
257270
- name: Install tox
258-
run: pip install setuptools==75.1.0 tox==4.26.0
271+
run: pip install tox==4.26.0
259272
- name: Setup tox environment
260273
run: tox run -e py --notest
261274
- name: Test

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: trailing-whitespace
77
- id: end-of-file-fixer
88
- repo: https://github.com/psf/black-pre-commit-mirror
9-
rev: 25.9.0
9+
rev: 26.1.0
1010
hooks:
1111
- id: black
1212
exclude: '^(test-data/)'
@@ -26,7 +26,7 @@ repos:
2626
hooks:
2727
- id: codespell
2828
args:
29-
- --ignore-words-list=HAX,ccompiler,ot,statics,whet,zar
29+
- --ignore-words-list=HAX,Nam,ccompiler,ot,statics,whet,zar
3030
exclude: ^(mypy/test/|mypy/typeshed/|mypyc/test-data/|test-data/).+$
3131
- repo: https://github.com/rhysd/actionlint
3232
rev: v1.7.7

0 commit comments

Comments
 (0)