Merge branch 'main' into patch-4

Author: Gobot1234

.flake8

@@ -1,44 +1,14 @@
-# The following rules come from plugins that are not used by typeshed.
-# Since typeshed stubs them, they can still be expected to be found in a
-# developer's venv for intellisense and reference reasons
-#     A      flake8-builtins
-#     D      flake8-docstrings
-#     N8     pep8-naming
-#     SIM    flake8-simplify
-#     RST    flake8-rst-docstrings
-#     TYP    flake8-typing-imports
-
-# The following rules are incompatible with or enforced by Black:
-#     E203   whitespace before ':' -- scripts only
-#     E301   expected 1 blank line
-#     E302   expected 2 blank lines
-#     E305   expected 2 blank lines
-#     E501   line too long
-#     E701   Multiple statements on one line (colon) -- disallows "..." on the same line
-
-# Some rules are considered irrelevant to stub files:
-#     B      All flake8-bugbear rules are .py-specific
-#     F401   imported but unused -- does not recognize re-exports
-#            https://github.com/PyCQA/pyflakes/issues/474
-
-# Rules that are out of the control of stub authors:
-#     E741   ambiguous variable name
-#     F403   import *' used; unable to detect undefined names
-#     F405   defined from star imports
-
 [flake8]
-extend-ignore = A, D, N8, SIM, RST, TYP, E301, E302, E305, E501, E701
+# 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
 per-file-ignores =
-  *.py: E203
-  *.pyi: B, E741, F401, F403, F405
-  # Since typing.pyi defines "overload" this is not recognized by Flake8 as typing.overload.
-  # Unfortunately, Flake8 does not allow to "noqa" just a specific error inside the file itself.
-  # https://github.com/PyCQA/flake8/issues/1079
-  #     F811 redefinition of unused '...'
-  stdlib/typing.pyi: B, E741, F401, F403, F405, F811
-  # Generated protobuf files include docstrings,
-  # and import some things from typing_extensions that could be imported from typing
-  *_pb2.pyi: B, E741, F401, F403, F405, Y021, Y023, Y026, Y053, Y054
+  # Generated protobuf files:
+  # Y021: Include docstrings
+  # Y023: Alias typing as typing_extensions
+  # Y026: Have implicit type aliases
+  # Y053: have literals >50 characters long
+  stubs/*_pb2.pyi: Y021, Y023, Y026, Y053
 
 exclude = .venv*,.git
-noqa_require_code = true

.gitattributes

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

.github/renovate.json5

@@ -0,0 +1,39 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "dependencyDashboard": true,
+  "suppressNotifications": ["prEditedNotification"],
+  "extends": ["config:recommended"],
+  "labels": ["bot: dependencies"],
+  "semanticCommits": "disabled",
+  "separateMajorMinor": false,
+  "prHourlyLimit": 10,
+  // This package rule disables updates for `actions/setup-python` Python versions:
+  // it's better to do these manually as there's often a reason why we can't use
+  // the latest Python version in CI for a specific job
+  ignoreDeps: ["python"],
+  "pre-commit": {
+    "enabled": true
+  },
+  "packageRules": [
+    {
+      groupName: "GitHub Actions",
+      matchManagers: ["github-actions"],
+      description: "Quarterly update of GitHub Action dependencies",
+      schedule: ["every 3 months on the first day of the month"]
+    },
+    {
+      groupName: "most test/lint dependencies",
+      matchManagers: ["pip_requirements", "pre-commit"],
+      matchPackageNames: ["!pyright"],
+      description: "Quarterly update of most test dependencies",
+      schedule: ["every 3 months on the first day of the month"]
+    },
+    {
+      "groupName": "pyright",
+      "matchManagers": ["pip_requirements"],
+      "matchPackageNames": ["pyright"],
+      "description": "Daily update of pyright",
+      "schedule": ["before 4am"]
+    }
+  ]
+}

.github/workflows/daily.yml

@@ -29,20 +29,19 @@ env:
 
 jobs:
   stubtest-stdlib:
-    name: Check stdlib with stubtest
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    name: "stubtest: stdlib"
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     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"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
@@ -51,96 +50,108 @@ jobs:
           check-latest: true
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
+      # Temporary to get @disjoint_base support; can remove once mypy 1.18 is released
+      - name: Install mypy from git
+        run: pip install git+https://github.com/python/mypy.git@116b92bae7b5dbf5e6bd36fd9b0c6804973e5554
       - name: Run stubtest
         run: python tests/stubtest_stdlib.py
 
   stubtest-third-party:
-    name: Check third party stubs with stubtest
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    name: "stubtest: third party"
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
         shard-index: [0, 1, 2, 3]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.13"
           cache: pip
           cache-dependency-path: |
             requirements-tests.txt
             stubs/**/METADATA.toml
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
-      - name: Run stubtest
+      - name: Install required system packages
         shell: bash
         run: |
           PACKAGES=$(python tests/get_stubtest_system_requirements.py)
 
           if [ "${{ runner.os }}" = "Linux" ]; then
             if [ -n "$PACKAGES" ]; then
-              sudo apt update && sudo apt install -y $PACKAGES
+              printf "Installing APT packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
+              sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
             fi
-
-            PYTHON_EXECUTABLE="xvfb-run python"
           else
             if [ "${{ runner.os }}" = "macOS" ] && [ -n "$PACKAGES" ]; then
-              brew install $PACKAGES
+              printf "Installing Homebrew packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
+              brew install -q $PACKAGES
             fi
 
             if [ "${{ runner.os }}" = "Windows" ] && [ -n "$PACKAGES" ]; then
+              printf "Installing Chocolatey packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
               choco install -y $PACKAGES
             fi
-
+          fi
+      - name: Run stubtest
+        shell: bash
+        run: |
+          if [ "${{ runner.os }}" = "Linux" ]; then
+            PYTHON_EXECUTABLE="xvfb-run python"
+          else
             PYTHON_EXECUTABLE="python"
           fi
 
-          $PYTHON_EXECUTABLE tests/stubtest_third_party.py --specified-platforms-only --num-shards 4 --shard-index ${{ matrix.shard-index }}
+          $PYTHON_EXECUTABLE tests/stubtest_third_party.py --ci-platforms-only --num-shards 4 --shard-index ${{ matrix.shard-index }}
 
   stub-uploader:
-    name: Run the stub_uploader tests
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    name: stub_uploader tests
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout typeshed
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: typeshed
       - name: Checkout stub_uploader
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: typeshed-internal/stub_uploader
           path: stub_uploader
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v6
         with:
-          python-version: "3.11"
-          cache: pip
-          cache-dependency-path: stub_uploader/requirements.txt
+          # Keep in sync with stub_uploader's check_scripts.yml workflow.
+          python-version: "3.13"
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "typeshed/requirements-tests.txt"
       - name: Run tests
         run: |
           cd stub_uploader
-          pip install -r requirements.txt
+          uv pip install -r requirements.txt --system
           python -m pytest tests
 
   # https://github.community/t/run-github-actions-job-only-if-previous-job-has-failed/174786/2
   create-issue-on-failure:
-    name: Create an issue if daily tests failed
+    name: Create issue on failure
     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@v8
         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"
@@ -27,62 +28,59 @@ concurrency:
 
 jobs:
   mypy:
-    name: Run mypy against the scripts and tests directories
+    name: Check scripts and tests with mypy
     runs-on: ubuntu-latest
     strategy:
       matrix:
         platform: ["linux", "win32"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: "3.11"
-          cache: pip
-          cache-dependency-path: requirements-tests.txt
-      - run: pip install -r requirements-tests.txt
+          python-version: "3.13"
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "requirements-tests.txt"
+      - run: uv pip install -r requirements-tests.txt --system
       - run: python ./tests/typecheck_typeshed.py --platform=${{ matrix.platform }}
   pyright:
-    name: Run pyright against the scripts and tests directories
+    name: Check scripts and tests with pyright
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-platform: ["Linux", "Windows"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: "3.9"
-          cache: pip
-          cache-dependency-path: requirements-tests.txt
-      - run: pip install -r requirements-tests.txt
-      - name: Get pyright version
-        uses: SebRollen/[email protected]
-        id: pyright_version
+          python-version: "3.13"
+      - uses: astral-sh/setup-uv@v6
         with:
-          file: "pyproject.toml"
-          field: "tool.typeshed.pyright_version"
+          version-file: "requirements-tests.txt"
+      - run: uv pip install -r requirements-tests.txt --system
       - name: Run pyright on typeshed
         uses: jakebailey/pyright-action@v2
         with:
-          version: ${{ steps.pyright_version.outputs.value }}
+          version: PATH
           python-platform: ${{ matrix.python-platform }}
-          python-version: "3.9"
+          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
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
+      - uses: astral-sh/setup-uv@v6
         with:
-          python-version: "3.11"
-          cache: pip
-          cache-dependency-path: requirements-tests.txt
+          version-file: "requirements-tests.txt"
       - name: Git config
         run: |
           git config --global user.name stubsabot
           git config --global user.email '<>'
-      - run: pip install -r requirements-tests.txt
+      - run: uv pip install -r requirements-tests.txt --system
       - run: python scripts/stubsabot.py --action-level local