Merge branch 'main' of https://github.com/python/typeshed into removing-setuptools._distutils

Author: Avasam

.github/renovate.json .github/renovate.json5.github/renovate.json renamed to .github/renovate.json5

@@ -17,6 +17,16 @@
       "description": "Quarterly update of GitHub Action dependencies",
       "schedule": ["every 3 months on the first day of the month"]
     },
+    {
+      // 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
+      groupName: "Python versions",
+      matchManagers: ["github-actions"],
+      matchPackageNames: ["python"],
+      description: "Disable PRs updating Python versions",
+      enabled: false,
+    },
     {
       "groupName": "most test/lint dependencies",
       "matchManagers": ["pip_requirements", "pre-commit"],

.github/workflows/daily.yml

@@ -29,7 +29,7 @@ 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:
@@ -54,7 +54,7 @@ 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:
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: pip
           cache-dependency-path: |
             requirements-tests.txt
@@ -80,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"
@@ -99,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:
@@ -114,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: |
@@ -124,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,7 +26,7 @@ concurrency:
 
 jobs:
   stubtest-stdlib:
-    name: Check stdlib with stubtest
+    name: "stubtest: stdlib"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

.github/workflows/stubtest_third_party.yml

@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   stubtest-third-party:
-    name: Check third party stubs with stubtest
+    name: "stubtest: third party"
 
     runs-on: ${{ matrix.os }}
     strategy:
@@ -41,7 +41,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: pip
           cache-dependency-path: |
             requirements-tests.txt
@@ -67,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`
@@ -122,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
@@ -155,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: |

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.3 # must match requirements-tests.txt
+    rev: v0.11.2 # must match requirements-tests.txt
     hooks:
       - id: ruff
         name: Run ruff on stubs, tests and scripts
@@ -31,7 +31,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.2
+    rev: 7.2.0
     hooks:
       - id: flake8
         language: python

CONTRIBUTING.md

@@ -462,33 +462,6 @@ steps:
 If feeling kindly, please update [mypy](https://github.com/python/mypy/blob/master/mypy/stubinfo.py)
 for any stub obsoletions or removals.
 
-## Maintainer guidelines
-
-The process for preparing and submitting changes also applies to
-maintainers.  This ensures high quality contributions and keeps
-everybody on the same page.  Avoid direct pushes to the repository.
-
-When reviewing pull requests, follow these guidelines:
-
-* Typing is hard. Try to be helpful and explain issues with the PR,
-  especially to new contributors.
-* When reviewing auto-generated stubs, just scan for red flags and obvious
-  errors. Leave possible manual improvements for separate PRs.
-* When reviewing large, hand-crafted PRs, you only need to look for red flags
-  and general issues, and do a few spot checks.
-* Review smaller, hand-crafted PRs thoroughly.
-
-When merging pull requests, follow these guidelines:
-
-* Always wait for tests to pass before merging PRs.
-* Use "[Squash and merge](https://github.com/blog/2141-squash-your-commits)" to merge PRs.
-* Make sure the commit message is meaningful. For example, remove irrelevant
-  intermediate commit messages.
-* The commit message for third-party stubs is used to generate the changelog.
-  It should be valid Markdown, be comprehensive, read like a changelog entry,
-  and assume that the reader has no access to the diff.
-* Delete branches for merged PRs (by maintainers pushing to the main repo).
-
 ### Marking PRs as "deferred"
 
 We sometimes use the ["status: deferred" label](https://github.com/python/typeshed/labels/status%3A%20deferred)
@@ -500,25 +473,9 @@ external factor. Blockers can include:
 - A dependency on a typing PEP that is still under consideration.
 - A pending change in a related project, such as stub-uploader.
 
-PRs should only be marked as "deferred" if there is a clear path towards getting
-the blocking issue resolved within a reasonable time frame. If a PR depends on
-a more amorphous change, such as a type system change that has not yet reached
-the PEP stage, it should instead be closed.
-
-Maintainers who add the "deferred" label should state clearly what exactly the
-blocker is, usually with a link to an open issue in another project.
-
 ### Closing stale PRs
 
 To keep the number of open PRs manageable, we may close PRs when they have been
 open for too long. Specifically, we close open PRs that either have failures in CI,
 serious merge conflicts or unaddressed feedback, and that have not seen any
 activity in three months.
-
-We want to maintain a welcoming atmosphere for contributors, so use a friendly
-message when closing the PR. Example message:
-
-    Thanks for contributing! I'm closing this PR for now, because it still
-    <fails some tests OR has unresolved review feedback OR has a merge conflict>
-    after three months of inactivity. If you are still interested, please feel free to open
-    a new PR (or ping us to reopen this one).