Merge branch 'main' into rm-ellipsis

Author: srittau

.flake8

@@ -2,7 +2,9 @@
 # Y: Flake8 is only used to run flake8-pyi, everything else is in Ruff
 select = Y
 # Ignore rules normally excluded by default
-extend-ignore = Y090,Y091
+# Also ignore Y041 (redundant (complex |) float | int), see
+# https://github.com/python/typeshed/issues/16059
+extend-ignore = Y041,Y090,Y091
 per-file-ignores =
   # Generated protobuf files:
   # Y021: Include docstrings

.github/workflows/daily.yml

@@ -1,4 +1,4 @@
-name: Daily test
+name: Daily tests
 
 on:
   workflow_dispatch:
@@ -35,15 +35,15 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
         exclude:
           # https://github.com/python/typeshed/issues/15694
           - os: "windows-latest"
             python-version: "3.10"
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
         uses: actions/setup-python@v6
         with:
@@ -67,7 +67,7 @@ jobs:
         shard-index: [0, 1, 2, 3]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: actions/setup-python@v6
         with:
           python-version: "3.13"
@@ -115,26 +115,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout typeshed
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           path: typeshed
       - name: Checkout stub_uploader
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: typeshed-internal/stub_uploader
           path: stub_uploader
-      - uses: actions/setup-python@v6
-        with:
-          # Keep in sync with stub_uploader's check_scripts.yml workflow.
-          python-version: "3.13"
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@v8.2.0
         with:
           version-file: "typeshed/requirements-tests.txt"
       - name: Run tests
         run: |
           cd stub_uploader
-          uv pip install -r requirements.txt --system
-          python -m pytest tests
+          # Keep Python version in sync with stub_uploader's check_scripts.yml workflow.
+          uv run --python=3.13 --no-project --with-requirements=requirements.txt -m pytest tests
 
   # https://github.community/t/run-github-actions-job-only-if-previous-job-has-failed/174786/2
   create-issue-on-failure:
@@ -145,7 +141,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/meta_tests.yml

@@ -1,5 +1,5 @@
 # This workflow is for testing typeshed's scripts and tests themselves
-name: Meta-tests
+name: Infrastructure tests
 
 on:
   workflow_dispatch:
@@ -28,35 +28,38 @@ concurrency:
 
 jobs:
   mypy:
-    name: Check scripts and tests with mypy
+    name: "mypy: type check"
     runs-on: ubuntu-latest
     strategy:
       matrix:
         platform: ["linux", "win32"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.13"
-      - uses: astral-sh/setup-uv@v7
+      - uses: actions/checkout@v7
+      - uses: astral-sh/setup-uv@v8.2.0
         with:
           version-file: "requirements-tests.txt"
-      - run: uv pip install -r requirements-tests.txt --system
-      - run: python ./tests/typecheck_typeshed.py --platform=${{ matrix.platform }}
+      - run: |
+          uv run \
+          --python=3.13 \
+          --no-project \
+          --with-requirements=requirements-tests.txt \
+          ./tests/typecheck_typeshed.py \
+          --platform=${{ matrix.platform }}
+
   pyright:
-    name: Check scripts and tests with pyright
+    name: "pyright: type check"
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-platform: ["Linux", "Windows"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: actions/setup-python@v6
         with:
           python-version: "3.13"
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@v8.2.0
         with:
           version-file: "requirements-tests.txt"
       - run: uv pip install -r requirements-tests.txt --system
@@ -67,20 +70,23 @@ jobs:
           python-platform: ${{ matrix.python-platform }}
           python-version: "3.10" # Oldest version supported for running scripts and tests
           project: ./pyrightconfig.scripts_and_tests.json
+
   stubsabot-dry-run:
-    name: Stubsabot dry run
+    name: "stubsabot: dry run"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.13"
-      - uses: astral-sh/setup-uv@v7
+      - uses: actions/checkout@v7
+      - uses: astral-sh/setup-uv@v8.2.0
         with:
           version-file: "requirements-tests.txt"
       - name: Git config
         run: |
           git config --global user.name stubsabot
           git config --global user.email '<>'
-      - run: uv pip install -r requirements-tests.txt --system
-      - run: python scripts/stubsabot.py --action-level local
+      - run: |
+          uv run \
+          --python=3.13 \
+          --no-project \
+          --with-requirements=requirements-tests.txt \
+          scripts/stubsabot.py \
+          --action-level=local

.github/workflows/mypy_primer.yml

@@ -1,4 +1,4 @@
-name: Run mypy_primer
+name: mypy_primer
 
 on:
   # Only run on PR, since we diff against main
@@ -22,10 +22,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        shard-index: [0, 1, 2, 3]
+        shard-index: [0, 1, 2, 3, 4, 5]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           path: typeshed_to_test
           fetch-depth: 0
@@ -52,7 +52,7 @@ jobs:
             --new v${MYPY_VERSION} --old v${MYPY_VERSION} \
             --custom-typeshed-repo typeshed_to_test \
             --new-typeshed $GITHUB_SHA --old-typeshed upstream_main \
-            --num-shards 4 --shard-index ${{ matrix.shard-index }} \
+            --num-shards 6 --shard-index ${{ matrix.shard-index }} \
             --debug \
             --output concise \
             | tee diff_${{ matrix.shard-index }}.txt

.github/workflows/mypy_primer_comment.yml

@@ -1,9 +1,9 @@
-name: Comment with mypy_primer diff
+name: mypy_primer (comment)
 
 on:
   workflow_run:
     workflows:
-      - Run mypy_primer
+      - mypy_primer
     types:
       - completed
 
@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Download diffs
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const fs = require('fs');
@@ -44,7 +44,7 @@ jobs:
 
       - name: Post comment
         id: post-comment
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/stubsabot.yml

@@ -1,4 +1,4 @@
-name: Run stubsabot daily
+name: Stubsabot
 
 on:
   workflow_dispatch:
@@ -19,25 +19,27 @@ jobs:
     if: github.repository == 'python/typeshed'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           # use an ssh key so that checks automatically run on stubsabot PRs
           ssh-key: ${{ secrets.STUBSABOT_SSH_PRIVATE_KEY }}
           fetch-depth: 0
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.13"
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@v8.2.0
         with:
           version-file: "requirements-tests.txt"
       - name: git config
         run: |
           git config --global user.name stubsabot
           git config --global user.email '<>'
-      - name: Install dependencies
-        run: uv pip install -r requirements-tests.txt --system
       - name: Run stubsabot
-        run: GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python scripts/stubsabot.py --action-level everything
+        run: |
+          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
+          uv run \
+          --python=3.13 \
+          --no-project \
+          --with-requirements=requirements-tests.txt \
+          scripts/stubsabot.py \
+          --action-level=everything
 
   # https://github.community/t/run-github-actions-job-only-if-previous-job-has-failed/174786/2
   create-issue-on-failure:
@@ -46,7 +48,7 @@ jobs:
     needs: [stubsabot]
     if: ${{ github.repository == 'python/typeshed' && always() && (needs.stubsabot.result == 'failure') }}
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/stubtest_stdlib.yml

@@ -1,4 +1,4 @@
-name: Stdlib stubtest
+name: "Stubtest: stdlib"
 
 on:
   workflow_dispatch:
@@ -31,15 +31,15 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
         exclude:
           # https://github.com/python/typeshed/issues/15694
           - os: "windows-latest"
             python-version: "3.10"
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
         uses: actions/setup-python@v6
         with:

.github/workflows/stubtest_third_party.yml

@@ -1,4 +1,4 @@
-name: Third-party stubtest
+name: "Stubtest: third-party"
 
 on:
   pull_request:
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v6