Merge branch 'main' into croniter-6.0.0

Author: srittau

.flake8

@@ -1,13 +1,10 @@
 [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: Typeshed is a testing ground for flake8-pyi, which monkeypatches F821
-select = NQA, Y, F821
+select = Y, F821
 # Ignore rules normally excluded by default
 extend-ignore = Y090
 per-file-ignores =
-  # We should only need to noqa Y and F821 codes in .pyi files
-  *.py: NQA
   # Generated protobuf files:
   # Y021: Include docstrings
   # Y023: Alias typing as typing_extensions
@@ -16,4 +13,3 @@ per-file-ignores =
   stubs/*_pb2.pyi: Y021, Y023, Y026, Y053
 
 exclude = .venv*,.git
-noqa_require_code = true

.github/workflows/daily.yml

@@ -29,14 +29,12 @@ env:
 
 jobs:
   stubtest-stdlib:
-    name: Check stdlib with stubtest
+    name: "stubtest: stdlib"
     if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # 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"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       fail-fast: false
 
@@ -56,23 +54,19 @@ jobs:
         run: python tests/stubtest_stdlib.py
 
   stubtest-third-party:
-    name: Check third party stubs with stubtest
+    name: "stubtest: third party"
     if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # 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"]
+        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@v5
         with:
-          # TODO: Use Python 3.12. As of 2024-03-08, several third-party
-          # packages fail to install with Python 3.12.
-          python-version: "3.11"
+          python-version: "3.13"
           cache: pip
           cache-dependency-path: |
             requirements-tests.txt
@@ -86,7 +80,7 @@ jobs:
 
           if [ "${{ runner.os }}" = "Linux" ]; then
             if [ -n "$PACKAGES" ]; then
-              sudo apt-get update && sudo apt-get install -y $PACKAGES
+              sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
             fi
 
             PYTHON_EXECUTABLE="xvfb-run python"
@@ -105,7 +99,7 @@ jobs:
           $PYTHON_EXECUTABLE tests/stubtest_third_party.py --specified-platforms-only --num-shards 4 --shard-index ${{ matrix.shard-index }}
 
   stub-uploader:
-    name: Run the stub_uploader tests
+    name: stub_uploader tests
     if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
@@ -120,7 +114,8 @@ jobs:
           path: stub_uploader
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          # Keep in sync with stub_uploader's check_scripts.yml workflow.
+          python-version: "3.13"
       - uses: astral-sh/setup-uv@v5
       - name: Run tests
         run: |
@@ -130,7 +125,7 @@ jobs:
 
   # 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 == 'schedule' && (needs.stubtest-stdlib.result == 'failure' || needs.stubtest-third-party.result == 'failure' || needs.stub-uploader.result == 'failure') }}

.github/workflows/meta_tests.yml

@@ -28,7 +28,7 @@ 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:
@@ -38,12 +38,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - 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:
@@ -53,6 +53,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
+          # TODO: Since pytype is not available for Python 3.13, and
+          # pytype_test.py imports pytype, we need to use Python 3.12 for now.
           python-version: "3.12"
       - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - run: uv pip install -r requirements-tests.txt --system
@@ -70,7 +72,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - name: Git config
         run: |

.github/workflows/stubsabot.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - name: git config
         run: |
@@ -39,7 +39,7 @@ jobs:
 
   # 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 stubsabot failed
+    name: Create issue on failure
     runs-on: ubuntu-latest
     needs: [stubsabot]
     if: ${{ github.repository == 'python/typeshed' && always() && (needs.stubsabot.result == 'failure') }}

.github/workflows/stubtest_stdlib.yml

@@ -26,13 +26,11 @@ concurrency:
 
 jobs:
   stubtest-stdlib:
-    name: Check stdlib with stubtest
+    name: "stubtest: stdlib"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # 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"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
       fail-fast: false
 

.github/workflows/stubtest_third_party.yml

@@ -27,14 +27,12 @@ concurrency:
 
 jobs:
   stubtest-third-party:
-    name: Check third party stubs with stubtest
+    name: "stubtest: third party"
 
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # 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"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
       fail-fast: false
 
     steps:
@@ -43,9 +41,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
-          # TODO: Use Python 3.12. As of 2024-03-08, several third-party
-          # packages fail to install with Python 3.12.
-          python-version: "3.11"
+          python-version: "3.13"
           cache: pip
           cache-dependency-path: |
             requirements-tests.txt
@@ -71,7 +67,7 @@ jobs:
             if [ "${{ runner.os }}" = "Linux" ]; then
               if [ -n "$PACKAGES" ]; then
                 echo "Installing apt packages: $PACKAGES"
-                sudo apt-get update && sudo apt-get install -y $PACKAGES
+                sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
               fi
 
               PYTHON_EXECUTABLE="xvfb-run python"

.github/workflows/tests.yml

@@ -29,19 +29,19 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - run: uv pip install -r requirements-tests.txt --system
       - run: python ./tests/check_typeshed_structure.py
 
   pytype:
-    name: Run pytype against the stubs
+    name: "pytype: Check stubs"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          # Max supported Python version as of pytype 2024.9.13
+          # Max supported Python version as of pytype 2024.10.11
           python-version: "3.12"
       - uses: astral-sh/setup-uv@v5
       - run: uv pip install -r requirements-tests.txt --system
@@ -56,7 +56,7 @@ jobs:
       - run: ./tests/pytype_test.py --print-stderr
 
   mypy:
-    name: Run mypy against the stubs
+    name: "mypy: Check stubs"
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -73,7 +73,7 @@ jobs:
       - run: python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${{ matrix.python-version }}
 
   regression-tests:
-    name: Run mypy on the test cases
+    name: "mypy: Run test cases"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
       - run: python ./tests/regr_test.py --all --verbosity QUIET
 
   pyright:
-    name: Test typeshed with pyright
+    name: "pyright: Run test cases"
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -98,7 +98,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - uses: astral-sh/setup-uv@v5
       - name: Install typeshed test-suite requirements
         # Install these so we can run `get_external_stub_requirements.py`
@@ -110,9 +110,6 @@ jobs:
           DEPENDENCIES=$( python tests/get_external_stub_requirements.py )
           if [ -n "$DEPENDENCIES" ]; then
               printf "Installing packages:\n  $(echo $DEPENDENCIES | sed 's/ /\n  /g')\n"
-              # TODO: We need to specify the platform here, but the platforms
-              # strings supported by uv are different from the ones supported by
-              # pyright.
               uv pip install --python-version ${{ matrix.python-version }} $DEPENDENCIES
           fi
       - name: Activate the isolated venv for the rest of the job
@@ -125,26 +122,26 @@ jobs:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
-          annotate: ${{ matrix.python-version == '3.12' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
+          annotate: ${{ matrix.python-version == '3.13' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
       - name: Run pyright with stricter settings on some of the stubs
         uses: jakebailey/pyright-action@v2
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
-          annotate: ${{ matrix.python-version == '3.12' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
+          annotate: ${{ matrix.python-version == '3.13' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.stricter.json
       - name: Run pyright on the test cases
         uses: jakebailey/pyright-action@v2
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
-          annotate: ${{ matrix.python-version == '3.12' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
+          annotate: ${{ matrix.python-version == '3.13' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.testcases.json
 
   stub-uploader:
-    name: Run the stub_uploader tests
+    name: stub_uploader tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout typeshed
@@ -158,7 +155,8 @@ jobs:
           path: stub_uploader
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          # Keep in sync with stub_uploader's check_scripts.yml workflow.
+          python-version: "3.13"
       - uses: astral-sh/setup-uv@v5
       - name: Run tests
         run: |

.gitignore

@@ -68,8 +68,10 @@ analyze.py
 # Mypy cache
 .mypy_cache/
 
-# pyenv local python version
+# pyenv and uv local python version
 .python-version
+# we don't use uv's lock as we're not actually a project
+uv.lock
 
 # deliberately local test configuration files
 stdlib/@tests/stubtest_allowlists/*.local

.pre-commit-config.yaml

@@ -31,12 +31,11 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.1.2
     hooks:
       - id: flake8
         language: python
         additional_dependencies:
-          - "flake8-noqa==1.4.0"
           - "flake8-pyi==24.9.0"
         types: [file]
         types_or: [python, pyi]