Merge branch 'master' into stubtest-dunder-posonly

Author: brianschubert

.github/workflows/docs.yml

@@ -12,6 +12,9 @@ on:
     # so it's important to do the docs build on all PRs touching mypy/errorcodes.py
     # in case somebody's adding a new error code without any docs
     - 'mypy/errorcodes.py'
+    # Part of the documentation is automatically generated from the options
+    # definitions in mypy/main.py
+    - 'mypy/main.py'
     - 'mypyc/doc/**'
     - '**/*.rst'
     - '**/*.md'

.github/workflows/mypy_primer.yml

@@ -39,7 +39,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: "3.14"
       - name: Install dependencies
         run: |
           python -m pip install -U pip
@@ -67,6 +67,7 @@ jobs:
             --debug \
             --additional-flags="--debug-serialize" \
             --output concise \
+            --mypy-install-librt \
             | tee diff_${{ matrix.shard-index }}.txt
           ) || [ $? -eq 1 ]
       - if: ${{ matrix.shard-index == 0 }}

.github/workflows/test.yml

@@ -31,70 +31,99 @@ jobs:
         include:
         # Make sure to run mypyc compiled unit tests for both
         # the oldest and newest supported Python versions
-        - name: Test suite with py39-ubuntu, mypyc-compiled
-          python: '3.9'
-          os: ubuntu-24.04-arm
-          toxenv: py
-          tox_extra_args: "-n 4"
-          test_mypyc: true
-        - name: Test suite with py310-ubuntu
+        - name: Test suite with py310-ubuntu, mypyc-compiled
           python: '3.10'
           os: ubuntu-24.04-arm
           toxenv: py
           tox_extra_args: "-n 4"
+          test_mypyc: true
         - name: Test suite with py311-ubuntu
           python: '3.11'
           os: ubuntu-24.04-arm
           toxenv: py
           tox_extra_args: "-n 4"
-        - name: Test suite with py312-ubuntu, mypyc-compiled
+        - name: Test suite with py312-ubuntu
           python: '3.12'
           os: ubuntu-24.04-arm
           toxenv: py
           tox_extra_args: "-n 4"
-          test_mypyc: true
         - name: Test suite with py313-ubuntu, mypyc-compiled
           python: '3.13'
           os: ubuntu-24.04-arm
           toxenv: py
           tox_extra_args: "-n 4"
           test_mypyc: true
-        - name: Test suite with py313-windows-64
-          python: '3.13'
-          os: windows-latest
+        - name: Test suite with py314-ubuntu, mypyc-compiled
+          python: '3.14'
+          os: ubuntu-24.04-arm
           toxenv: py
           tox_extra_args: "-n 4"
-
-        - name: Test suite with py314-dev-ubuntu
-          python: '3.14-dev'
+          test_mypyc: true
+        - name: Test suite with py314t-ubuntu, mypyc-compiled
+          python: '3.14t'
           os: ubuntu-24.04-arm
           toxenv: py
           tox_extra_args: "-n 4"
-          # allow_failure: true
           test_mypyc: true
+        - name: Test suite with py314-windows-64
+          python: '3.14'
+          os: windows-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+
+        # - name: Test suite with py315-dev-ubuntu
+        #   python: '3.15-dev'
+        #   os: ubuntu-24.04-arm
+        #   toxenv: py
+        #   tox_extra_args: "-n 4"
+        #   # allow_failure: true
+        #   test_mypyc: true
+
+        - name: mypyc runtime tests with py313-macos
+          python: '3.13'
+          os: macos-latest
+          toxenv: py
+          tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py"
 
-        - name: mypyc runtime tests with py39-macos
-          python: '3.9.21'
-          # TODO: macos-13 is the last one to support Python 3.9, change it to macos-latest when updating the Python version
-          os: macos-13
+        - name: mypyc runtime tests with py310-ubuntu
+          python: '3.10'
+          os: ubuntu-latest
           toxenv: py
           tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py"
+
         # This is broken. See
         # - https://github.com/python/mypy/issues/17819
         # - https://github.com/python/mypy/pull/17822
-        # - name: mypyc runtime tests with py38-debug-build-ubuntu
-        #   python: '3.9.21'
+        # - name: mypyc runtime tests with py310-debug-build-ubuntu
+        #   python: '3.10'
         #   os: ubuntu-latest
         #   toxenv: py
         #   tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py"
         #   debug_build: true
 
-        - name: Type check our own code (py39-ubuntu)
-          python: '3.9'
+        - name: Parallel tests with py314-ubuntu, interpreted
+          python: '3.14'
+          os: ubuntu-24.04-arm
+          toxenv: py
+          tox_extra_args: "-n 4 --mypy-num-workers=4 mypy/test/testcheck.py"
+        - name: Parallel tests with py314-ubuntu, mypyc-compiled
+          python: '3.14'
+          os: ubuntu-24.04-arm
+          toxenv: py
+          tox_extra_args: "-n 4 --mypy-num-workers=4 mypy/test/testcheck.py"
+          test_mypyc: true
+        - name: Parallel tests with py314-windows-64, interpreted
+          python: '3.14'
+          os: windows-latest
+          toxenv: py
+          tox_extra_args: "-n 2 --mypy-num-workers=2 mypy/test/testcheck.py -k 'incremental or modules or classes'"
+
+        - name: Type check our own code (py310-ubuntu)
+          python: '3.10'
           os: ubuntu-latest
           toxenv: type
-        - name: Type check our own code (py39-windows-64)
-          python: '3.9'
+        - name: Type check our own code (py310-windows-64)
+          python: '3.10'
           os: windows-latest
           toxenv: type
 
@@ -128,24 +157,15 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Debug build
-      if: ${{ matrix.debug_build }}
-      run: |
-        PYTHONVERSION=${{ matrix.python }}
-        PYTHONDIR=~/python-debug/python-$PYTHONVERSION
-        VENV=$PYTHONDIR/env
-        ./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
-        # TODO: does this do anything? env vars aren't passed to the next step right
-        source $VENV/bin/activate
     - name: Latest dev build
       if: ${{ endsWith(matrix.python, '-dev') }}
       run: |
           git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch $( echo ${{ matrix.python }} | sed 's/-dev//' )
           cd /tmp/cpython
           echo git rev-parse HEAD; git rev-parse HEAD
           git show --no-patch
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
+          sudo apt-get update -q
+          sudo apt-get install -q -y --no-install-recommends \
             build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
             libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
           ./configure --prefix=/opt/pythondev
@@ -154,6 +174,23 @@ jobs:
           sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
           sudo ln -s /opt/pythondev/bin/pip3 /opt/pythondev/bin/pip
           echo "/opt/pythondev/bin" >> $GITHUB_PATH
+    - name: Debug build
+      if: ${{ matrix.debug_build }}
+      run: |
+          git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch ${{ matrix.python }}
+          cd /tmp/cpython
+          echo git rev-parse HEAD; git rev-parse HEAD
+          git show --no-patch
+          sudo apt-get update -q
+          sudo apt-get install -q -y --no-install-recommends \
+            build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
+            libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
+          ./configure CFLAGS="-DPy_DEBUG -DPy_TRACE_REFS -DPYMALLOC_DEBUG" --with-pydebug -with-trace-refs --prefix=/opt/pythondev
+          make -j$(nproc)
+          sudo make install
+          sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
+          sudo ln -s /opt/pythondev/bin/pip3 /opt/pythondev/bin/pip
+          echo "/opt/pythondev/bin" >> $GITHUB_PATH
     - uses: actions/setup-python@v5
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}
       with:

.github/workflows/test_stubgenc.yml

@@ -11,7 +11,7 @@ on:
     - 'mypy/stubgenc.py'
     - 'mypy/stubdoc.py'
     - 'mypy/stubutil.py'
-    - 'test-data/stubgen/**'
+    - 'test-data/pybind11_fixtures/**'
 
 permissions:
   contents: read
@@ -32,10 +32,10 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Setup 🐍 3.9
+    - name: Setup 🐍 3.10
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: '3.10'
 
     - name: Test stubgenc
       run: misc/test-stubgenc.sh

.pre-commit-config.yaml

@@ -6,14 +6,14 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.1.0
+    rev: 26.1.0
     hooks:
       - id: black
         exclude: '^(test-data/)'
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.4
+    rev: v0.14.3
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--exit-non-zero-on-fix]
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.32.1
@@ -41,7 +41,7 @@ repos:
           # actionlint has a shellcheck integration which extracts shell scripts in `run:` steps from GitHub Actions
           # and checks these with shellcheck. This is arguably its most useful feature,
           # but the integration only works if shellcheck is installed
-          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.10.0"
+          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.11.1"
   - repo: https://github.com/woodruffw/zizmor-pre-commit
     rev: v1.5.2
     hooks: