Merge branch 'main' into set-narrowing

Author: srittau

.flake8

@@ -1,7 +1,7 @@
 [flake8]
 # NQA: Ruff won't warn about redundant `# noqa: Y`
 # Y: Flake8 is only used to run flake8-pyi, everything else is in Ruff
-# F821: Until https://github.com/astral-sh/ruff/issues/3011 is fixed, we need flake8-pyi's monkeypatching
+# F821: Typeshed is a testing ground for flake8-pyi, which monkeypatches F821
 select = NQA, Y, F821
 # Ignore rules normally excluded by default
 extend-ignore = Y090
@@ -13,7 +13,7 @@ per-file-ignores =
   # Y023: Alias typing as typing_extensions
   # Y026: Have implicit type aliases
   # Y053: have literals >50 characters long
-  *_pb2.pyi: Y021, Y023, Y026, Y053
+  stubs/*_pb2.pyi: Y021, Y023, Y026, Y053
 
 exclude = .venv*,.git
 noqa_require_code = true

.gitattributes

@@ -3,7 +3,7 @@
 * eol=lf
 # Set linguist-language to support comments syntax highlight
 **/stubtest_allowlist*.txt linguist-language=ini
-tests/stubtest_allowlists/*.txt linguist-language=ini
+**/stubtest_allowlists/*.txt linguist-language=ini
 tests/pytype_exclude_list.txt linguist-language=ini
 pyrightconfig*.json linguist-language=jsonc
 .vscode/*.json linguist-language=jsonc

.github/renovate.json

@@ -2,8 +2,11 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "dependencyDashboard": true,
   "suppressNotifications": ["prEditedNotification"],
-  "extends": ["config:base"],
+  "extends": ["config:recommended"],
   "labels": ["bot: dependencies"],
+  "semanticCommits": "disabled",
+  "separateMajorMinor": false,
+  "prHourlyLimit": 10,
   "pre-commit": {
     "enabled": true
   },
@@ -12,23 +15,20 @@
       "groupName": "GitHub Actions",
       "matchManagers": ["github-actions"],
       "description": "Quarterly update of GitHub Action dependencies",
-      "separateMajorMinor": "false",
       "schedule": ["every 3 months on the first day of the month"]
     },
     {
       "groupName": "most test/lint dependencies",
       "matchManagers": ["pip_requirements", "pre-commit"],
       "excludePackageNames": ["pytype", "pyright"],
       "description": "Quarterly update of most test dependencies",
-      "separateMajorMinor": "false",
       "schedule": ["every 3 months on the first day of the month"]
     },
     {
       "groupName": "pytype and pyright",
       "matchManagers": ["pip_requirements"],
       "matchPackageNames": ["pytype", "pyright"],
       "description": "Daily update of pyright and pytype",
-      "separateMajorMinor": "false",
       "schedule": ["before 4am"]
     }
   ]

.github/workflows/daily.yml

@@ -34,9 +34,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # tkinter doesn't import on macOS-12
-        os: ["ubuntu-latest", "windows-latest", "macos-11"]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        # As of 2024-10-18, ubuntu-latest can refer to different Ubuntu versions,
+        # which can can cause problems with os module constants.
+        os: ["ubuntu-24.04", "windows-latest", "macos-latest"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       fail-fast: false
 
     steps:
@@ -60,7 +61,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+        # As of 2024-10-18, ubuntu-latest can refer to different Ubuntu versions,
+        # which causes problems when testing gdb.
+        os: ["ubuntu-24.04", "windows-latest", "macos-latest"]
         shard-index: [0, 1, 2, 3]
       fail-fast: false
     steps:
@@ -83,13 +86,13 @@ jobs:
 
           if [ "${{ runner.os }}" = "Linux" ]; then
             if [ -n "$PACKAGES" ]; then
-              sudo apt update && sudo apt install -y $PACKAGES
+              sudo apt-get update && sudo apt-get install -y $PACKAGES
             fi
 
             PYTHON_EXECUTABLE="xvfb-run python"
           else
             if [ "${{ runner.os }}" = "macOS" ] && [ -n "$PACKAGES" ]; then
-              brew install $PACKAGES
+              brew install -q $PACKAGES
             fi
 
             if [ "${{ runner.os }}" = "Windows" ] && [ -n "$PACKAGES" ]; then
@@ -118,8 +121,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - name: Install uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: astral-sh/setup-uv@v5
       - name: Run tests
         run: |
           cd stub_uploader
@@ -131,18 +133,18 @@ jobs:
     name: Create an issue if daily tests failed
     runs-on: ubuntu-latest
     needs: [stubtest-stdlib, stubtest-third-party, stub-uploader]
-    if: ${{ github.repository == 'python/typeshed' && always() && github.event_name != 'pull_request' && (needs.stubtest-stdlib.result == 'failure' || needs.stubtest-third-party.result == 'failure' || needs.stub-uploader.result == 'failure') }}
+    if: ${{ github.repository == 'python/typeshed' && always() && github.event_name == 'schedule' && (needs.stubtest-stdlib.result == 'failure' || needs.stubtest-third-party.result == 'failure' || needs.stub-uploader.result == 'failure') }}
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             await github.rest.issues.create({
               owner: "python",
               repo: "typeshed",
               title: `Daily tests failed on ${new Date().toDateString()}`,
-              body: "Runs listed here: https://github.com/python/typeshed/actions/workflows/daily.yml",
+              body: "Run listed here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               labels: ["help wanted"],
             })

.github/workflows/meta_tests.yml

@@ -10,6 +10,7 @@ on:
     paths:
       - "scripts/**"
       - "tests/**"
+      - "lib/**"
       - ".github/workflows/meta_tests.yml"
       - "requirements-tests.txt"
       - "pyproject.toml"
@@ -52,22 +53,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          # Max supported Python version as of pytype 2024.2.27.
-          python-version: "3.11"
+          python-version: "3.12"
       - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - run: uv pip install -r requirements-tests.txt --system
-      - name: Get pyright version
-        id: pyright_version
-        run: |
-          PYRIGHT_VERSION=$(grep pyright== requirements-tests.txt | cut -d "#" -f 1 | cut -d \; -f 1 | cut -d = -f 3)
-          echo pyright version: "${PYRIGHT_VERSION}"
-          echo PYRIGHT_VERSION="${PYRIGHT_VERSION}" >> "${GITHUB_OUTPUT}"
       - name: Run pyright on typeshed
         uses: jakebailey/pyright-action@v2
         with:
-          version: ${{ steps.pyright_version.outputs.PYRIGHT_VERSION }}
+          version: PATH
           python-platform: ${{ matrix.python-platform }}
-          python-version: "3.9" # The Python version to test against.
+          python-version: "3.9" # Oldest version supported for running scripts and tests
           project: ./pyrightconfig.scripts_and_tests.json
   stubsabot-dry-run:
     name: Stubsabot dry run

.github/workflows/mypy_primer.yml

@@ -31,9 +31,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
-          # TODO: As of 2024-03-08, confluent-kafka fails to install with
-          # Python 3.12.
-          python-version: "3.11"
+          python-version: "3.13"
       - name: Install dependencies
         run: pip install git+https://github.com/hauntsaninja/mypy_primer.git
       - name: Run mypy_primer
@@ -59,18 +57,35 @@ jobs:
             --output concise \
             | 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
+      - name: Upload mypy_primer diff + PR number
+        uses: actions/upload-artifact@v4
+        if: ${{ matrix.shard-index == 0 }}
+        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

@@ -1,4 +1,4 @@
-name: Post mypy_primer comment
+name: Comment with mypy_primer diff
 
 on:
   workflow_run:
@@ -14,11 +14,11 @@ permissions:
 jobs:
   comment:
     name: Comment PR from mypy_primer
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
+    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');
@@ -44,9 +44,9 @@ jobs:
 
       - name: Post comment
         id: post-comment
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const fs = require('fs')
             let data = fs.readFileSync('fulldiff.txt', { encoding: 'utf8' })
@@ -59,6 +59,9 @@ jobs:
               data = truncated_data + `\n\n... (truncated ${lines_truncated} lines) ...\n`
             }
 
+            console.log("Diff from mypy_primer:")
+            console.log(data)
+
             let body
             if (data.trim()) {
               body = 'Diff from [mypy_primer](https://github.com/hauntsaninja/mypy_primer), showing the effect of this PR on open source code:\n```diff\n' + data + '```'

.github/workflows/stubsabot.yml

@@ -44,13 +44,13 @@ jobs:
     needs: [stubsabot]
     if: ${{ github.repository == 'python/typeshed' && always() && (needs.stubsabot.result == 'failure') }}
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             await github.rest.issues.create({
               owner: "python",
               repo: "typeshed",
               title: `Stubsabot failed on ${new Date().toDateString()}`,
-              body: "Stubsabot runs are listed here: https://github.com/python/typeshed/actions/workflows/stubsabot.yml",
+              body: "Stubsabot run is listed here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
             })

.github/workflows/stubtest_stdlib.yml

@@ -30,9 +30,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # tkinter doesn't import on macOS 12
-        os: ["ubuntu-latest", "windows-latest", "macos-11"]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        # As of 2024-10-18, ubuntu-latest can refer to different Ubuntu versions,
+        # which can can cause problems with os module constants.
+        os: ["ubuntu-24.04", "windows-latest", "macos-latest"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       fail-fast: false
 
     steps:

.github/workflows/stubtest_third_party.yml

@@ -32,7 +32,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+        # As of 2024-10-18, ubuntu-latest can refer to different Ubuntu versions,
+        # which causes problems when testing gdb.
+        os: ["ubuntu-24.04", "windows-latest", "macos-latest"]
       fail-fast: false
 
     steps:
@@ -69,14 +71,14 @@ jobs:
             if [ "${{ runner.os }}" = "Linux" ]; then
               if [ -n "$PACKAGES" ]; then
                 echo "Installing apt packages: $PACKAGES"
-                sudo apt update && sudo apt install -y $PACKAGES
+                sudo apt-get update && sudo apt-get install -y $PACKAGES
               fi
 
               PYTHON_EXECUTABLE="xvfb-run python"
             else
               if [ "${{ runner.os }}" = "macOS" ] && [ -n "$PACKAGES" ]; then
                 echo "Installing Homebrew packages: $PACKAGES"
-                brew install $PACKAGES
+                brew install -q $PACKAGES
               fi
 
               if [ "${{ runner.os }}" = "Windows" ] && [ -n "$PACKAGES" ]; then