Merge tag '1.14-fork' into merge-upstream

# Conflicts:
#	CHANGELOG.md
#	CONTRIBUTING.md
#	MANIFEST.in
#	docs/source/conf.py
#	docs/source/config_file.rst
#	misc/apply-cache-diff.py
#	misc/diff-cache.py
#	mypy/binder.py
#	mypy/build.py
#	mypy/checker.py
#	mypy/checkexpr.py
#	mypy/constraints.py
#	mypy/errors.py
#	mypy/fastparse.py
#	mypy/main.py
#	mypy/modulefinder.py
#	mypy/nodes.py
#	mypy/options.py
#	mypy/semanal.py
#	mypy/test/data.py
#	mypy/typeanal.py
#	mypy/typeshed/stdlib/_operator.pyi
#	mypy/typeshed/stdlib/contextvars.pyi
#	mypy/typeshed/stdlib/fileinput.pyi
#	mypy/typeshed/stdlib/importlib/machinery.pyi
#	mypy/typeshed/stdlib/io.pyi
#	mypy/typeshed/stdlib/multiprocessing/managers.pyi
#	mypy/typeshed/stdlib/os/__init__.pyi
#	mypy/typeshed/stdlib/re.pyi
#	mypy/util.py
#	pyproject.toml
#	setup.py
#	test-data/unit/check-enum.test
#	test-data/unit/check-modules.test
#	test-data/unit/check-protocols.test
#	test-data/unit/check-python313.test
#	test-data/unit/check-typevar-defaults.test
#	test-data/unit/check-varargs.test
#	test-data/unit/cmdline.test
#	test-data/unit/pythoneval.test

Author: KotlinIsland

.github/workflows/docs.yml

@@ -28,6 +28,7 @@ concurrency:
 jobs:
   docs:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     env:
       TOXENV: docs
       TOX_SKIP_MISSING_INTERPRETERS: False
@@ -38,7 +39,7 @@ jobs:
         with:
           python-version: '3.12'
       - name: Install tox
-        run: pip install tox==4.11.0
+        run: pip install tox==4.21.2
       - name: Setup tox environment
         run: tox run -e ${{ env.TOXENV }} --notest
       - name: Test

.github/workflows/mypy_primer.yml

@@ -32,6 +32,7 @@ jobs:
       matrix:
         shard-index: [0, 1, 2, 3, 4]
       fail-fast: false
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
         with:
@@ -72,18 +73,35 @@ jobs:
             --project-selector "^(?!https://github.com/(spack/spack|mitmproxy/mitmproxy))" \
             | tee diff_${{ matrix.shard-index }}.txt
           ) || [ $? -eq 1 ]
-      - name: Upload mypy_primer diff
-        uses: actions/upload-artifact@v3
-        with:
-          name: mypy_primer_diffs
-          path: diff_${{ matrix.shard-index }}.txt
-      - if: ${{ matrix.shard-index }} == 0
+      - if: ${{ matrix.shard-index == 0 }}
         name: Save PR number
         run: |
           echo ${{ github.event.pull_request.number }} | tee pr_number.txt
-      - if: ${{ matrix.shard-index }} == 0
-        name: Upload PR number
-        uses: actions/upload-artifact@v3
+      - if: ${{ matrix.shard-index == 0 }}
+        name: Upload mypy_primer diff + PR number
+        uses: actions/upload-artifact@v4
+        with:
+          name: mypy_primer_diffs-${{ matrix.shard-index }}
+          path: |
+            diff_${{ matrix.shard-index }}.txt
+            pr_number.txt
+      - name: Upload mypy_primer diff
+        uses: actions/upload-artifact@v4
+        if: ${{ matrix.shard-index != 0 }}
+        with:
+          name: mypy_primer_diffs-${{ matrix.shard-index }}
+          path: diff_${{ matrix.shard-index }}.txt
+
+  join_artifacts:
+    name: Join artifacts
+    runs-on: ubuntu-latest
+    needs: [mypy_primer]
+    permissions:
+      contents: read
+    steps:
+      - name: Merge artifacts
+        uses: actions/upload-artifact/merge@v4
         with:
           name: mypy_primer_diffs
-          path: pr_number.txt
+          pattern: mypy_primer_diffs-*
+          delete-merged: true

.github/workflows/mypy_primer_comment.yml

@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Download diffs
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const fs = require('fs');

.github/workflows/sync_typeshed.yml

@@ -14,6 +14,7 @@ jobs:
     name: Sync typeshed
     if: github.repository == 'python/mypy'
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/test.yml

@@ -70,14 +70,14 @@ jobs:
           toxenv: py
           tox_extra_args: "-n 4"
           test_mypyc: true
-
-        - name: Test suite with py313-dev-ubuntu, mypyc-compiled
-          python: '3.13-dev'
+        - name: Test suite with py313-ubuntu, mypyc-compiled
+          python: '3.13'
           arch: x64
           os: ubuntu-latest
           toxenv: py
           tox_extra_args: "-n 4"
           test_mypyc: true
+
         # - name: Test suite with py314-dev-ubuntu
         #   python: '3.14-dev'
         #   arch: x64
@@ -94,13 +94,16 @@ jobs:
           os: macos-13
           toxenv: py
           tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py"
-        - name: mypyc runtime tests with py38-debug-build-ubuntu
-          python: '3.8.17'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py"
-          debug_build: true
+        # 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.8.17'
+        #   arch: x64
+        #   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 (py38-ubuntu)
           python: '3.8'
@@ -123,10 +126,11 @@ jobs:
           toxenv: lint
 
     name: ${{ matrix.name }}
+    timeout-minutes: 60
     env:
       TOX_SKIP_MISSING_INTERPRETERS: False
-      # Rich (pip)
-      FORCE_COLOR: 1
+      # Rich (pip) -- Disable color for windows + pytest
+      FORCE_COLOR: ${{ !(startsWith(matrix.os, 'windows-') && startsWith(matrix.toxenv, 'py')) && 1 || 0 }}
       # Tox
       PY_COLORS: 1
       # Pytest
@@ -144,17 +148,17 @@ jobs:
         ./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
+    - name: Latest dev build
       if: ${{ endsWith(matrix.python, '-dev') }}
       run: |
-          sudo apt-get update
-          sudo apt-get install -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
           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 \
+            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
           make -j$(nproc)
           sudo make install
@@ -176,7 +180,7 @@ jobs:
         echo debug build; python -c 'import sysconfig; print(bool(sysconfig.get_config_var("Py_DEBUG")))'
         echo os.cpu_count; python -c 'import os; print(os.cpu_count())'
         echo os.sched_getaffinity; python -c 'import os; print(len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
-        pip install setuptools==68.2.2 tox==4.11.0
+        pip install setuptools==75.1.0 tox==4.21.2
 
     - name: Compiled with mypyc
       if: ${{ matrix.test_mypyc }}
@@ -186,7 +190,7 @@ jobs:
 
     - name: Setup tox environment
       run: |
-        tox run -e ${{ matrix.toxenv }} --notes
+        tox run -e ${{ matrix.toxenv }} --notest
     - name: Test
       run: tox run -e ${{ matrix.toxenv }} --skip-pkg-install -- ${{ matrix.tox_extra_args }}
       continue-on-error: ${{ matrix.allow_failure == 'true' }}
@@ -198,6 +202,7 @@ jobs:
   python_32bits:
     runs-on: ubuntu-latest
     name: Test mypyc suite with 32-bit Python
+    timeout-minutes: 60
     env:
       TOX_SKIP_MISSING_INTERPRETERS: False
       # Rich (pip)
@@ -232,7 +237,7 @@ jobs:
           default: 3.11.1
           command: python -c "import platform; print(f'{platform.architecture()=} {platform.machine()=}');"
       - name: Install tox
-        run: pip install setuptools==68.2.2 tox==4.11.0
+        run: pip install setuptools==75.1.0 tox==4.21.2
       - name: Setup tox environment
         run: tox run -e py --notest
       - name: Test

.github/workflows/test_stubgenc.yml

@@ -25,6 +25,7 @@ jobs:
     # Check stub file generation for a small pybind11 project
     # (full text match is required to pass)
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
 
     - uses: actions/checkout@v4