Merge branch 'main' of https://github.com/python/typeshed into using-dependency-groups-for-dev-dependencies

Author: Avasam

.gitattributes

@@ -4,6 +4,5 @@
 # Set linguist-language to support comments syntax highlight
 **/stubtest_allowlist*.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.json5

@@ -24,15 +24,15 @@
     {
       groupName: "most test/lint dependencies",
       matchManagers: ["pip_requirements", "pre-commit"],
-      matchPackageNames: ["!pytype", "!pyright"],
+      matchPackageNames: ["!pyright"],
       description: "Quarterly update of most test dependencies",
       schedule: ["every 3 months on the first day of the month"]
     },
     {
-      "groupName": "pytype and pyright",
+      "groupName": "pyright",
       "matchManagers": ["pip_requirements"],
-      "matchPackageNames": ["pytype", "pyright"],
-      "description": "Daily update of pyright and pytype",
+      "matchPackageNames": ["pyright"],
+      "description": "Daily update of pyright",
       "schedule": ["before 4am"]
     }
   ]

.github/workflows/daily.yml

@@ -30,12 +30,12 @@ env:
 jobs:
   stubtest-stdlib:
     name: "stubtest: stdlib"
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:
@@ -55,7 +55,7 @@ jobs:
 
   stubtest-third-party:
     name: "stubtest: third party"
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -73,34 +73,41 @@ jobs:
             stubs/**/METADATA.toml
       - name: Install dependencies
         run: pip install --group=dev
-      - 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
+              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
+              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: stub_uploader tests
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout typeshed
@@ -117,6 +124,8 @@ jobs:
           # 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/pyproject.toml"
       - name: Run tests
         run: |
           cd stub_uploader

.github/workflows/meta_tests.yml

@@ -38,7 +38,9 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.13"
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - run: uv pip install --group=dev --system
       - run: python ./tests/typecheck_typeshed.py --platform=${{ matrix.platform }}
   pyright:
@@ -52,10 +54,10 @@ 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
+          python-version: "3.13"
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - run: uv pip install --group=dev --system
       - name: Run pyright on typeshed
         uses: jakebailey/pyright-action@v2
@@ -72,7 +74,9 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.13"
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - name: Git config
         run: |
           git config --global user.name stubsabot

.github/workflows/stubsabot.yml

@@ -27,7 +27,9 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.13"
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - name: git config
         run: |
           git config --global user.name stubsabot

.github/workflows/stubtest_stdlib.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:

.github/workflows/stubtest_third_party.yml

@@ -48,44 +48,54 @@ jobs:
             stubs/**/METADATA.toml
       - name: Install dependencies
         run: pip install --group=dev
-      - name: Run stubtest
+      - name: Determine changed stubs
         shell: bash
         run: |
           # This only runs stubtest on changed stubs, because it is much faster.
           # Use the daily.yml workflow to run stubtest on all third party stubs.
           function find_stubs {
             git diff --name-only origin/${{ github.base_ref }} HEAD | \
             egrep ^stubs/ | cut -d "/" -f 2 | sort -u | \
-            (while read stub; do [ -d "stubs/$stub" ] && echo "$stub" || true; done)
+            (while read stub; do [ -d "stubs/$stub" ] && echo -n "$stub " || true; done)
           }
           STUBS=$(find_stubs || echo '')
-
+          echo "Changed stubs: $STUBS"
+          echo "STUBS=$STUBS" >> $GITHUB_ENV
+      - name: Install required system packages
+        shell: bash
+        run: |
           if [ -n "$STUBS" ]; then
-            echo "Testing $STUBS..."
             PACKAGES=$(python tests/get_stubtest_system_requirements.py $STUBS)
-
             if [ "${{ runner.os }}" = "Linux" ]; then
               if [ -n "$PACKAGES" ]; then
-                echo "Installing apt packages: $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
-                echo "Installing Homebrew packages: $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
-                echo "Installing Chocolatey packages: $PACKAGES"
+                printf "Installing Chocolatey packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
                 choco install -y $PACKAGES
               fi
+            fi
+          fi
+      - name: Run stubtest
+        shell: bash
+        run: |
+          if [ -n "$STUBS" ]; then
+            echo "Testing $STUBS..."
 
+            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 $STUBS
+            $PYTHON_EXECUTABLE tests/stubtest_third_party.py --ci-platforms-only $STUBS
           else
             echo "Nothing to test"
           fi

.github/workflows/tests.yml

@@ -30,66 +30,42 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.13"
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - run: uv pip install --group=dev --system
-      - run: python ./tests/check_typeshed_structure.py
-
-  pytype:
-    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.10.11
-          python-version: "3.12"
       - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - run: uv pip install --group=dev --system
-      - name: Install external dependencies for 3rd-party stubs
-        run: |
-          DEPENDENCIES=$( python tests/get_external_stub_requirements.py )
-          if [ -n "$DEPENDENCIES" ]; then
-              printf "Installing packages:\n  $(echo $DEPENDENCIES | sed 's/ /\n  /g')\n"
-              uv pip install --system $DEPENDENCIES
-          fi
-      - run: uv pip freeze
-      - run: ./tests/pytype_test.py --print-stderr
+      - run: python ./tests/check_typeshed_structure.py
 
   mypy:
     name: "mypy: Check stubs"
     runs-on: ubuntu-latest
     strategy:
       matrix:
         platform: ["linux", "win32", "darwin"]
-        # TODO (2025-05-10) "3.13.2" should be "3.14-dev", see below.
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.13.2"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+          allow-prereleases: true
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - run: uv pip install -r requirements-tests.txt --system
       - name: Install required APT packages
         run: |
-          sudo apt-get update -qy
-          DEPENDENCIES=$( python tests/get_external_apt_dependencies.py )
-          if [ -n "$DEPENDENCIES" ]; then
-              printf "Installing APT packages:\n  $(echo $DEPENDENCIES | sed 's/ /\n  /g')\n"
-              sudo apt-get install -qy $DEPENDENCIES
+          PACKAGES=$(python tests/get_stubtest_system_requirements.py)
+          if [ -n "$PACKAGES" ]; then
+            printf "Installing APT packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
+            sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
           fi
       - name: Run mypy_test.py
         run: |
-          # TODO: (2025-05-10) This is a bad hack to work around mypy crashing
-          # when running on Python 3.14. See https://github.com/python/mypy/pull/19020.
-          if [[ "${{ matrix.python-version }}" == "3.13.2" ]]; then
-              MYPY_PY_VERSION="3.14"
-          else
-            # python-version can sometimes be pinned to a specific version or to "-dev", but
-            # mypy understands only X.Y version numbers.
-            MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
-          fi
+          # python-version can sometimes be pinned to a specific version or to "-dev", but
+          # mypy understands only X.Y version numbers.
+          MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
           python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${MYPY_PY_VERSION}
 
   regression-tests:
@@ -102,7 +78,9 @@ jobs:
           # Use py311 for now, as py312 seems to be around 30s slower in CI
           # TODO: figure out why that is (#11590)
           python-version: "3.11"
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - run: uv pip install --group=dev --system
       - run: python ./tests/regr_test.py --all --verbosity QUIET
 
@@ -120,25 +98,26 @@ jobs:
         with:
           python-version: "3.13"
       - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "pyproject.toml"
       - name: Install typeshed test-suite requirements
-        # Install these so we can run `get_external_stub_requirements.py`
+        # Install these so we can run `get_*_requirements.py`
         run: uv pip install --group=dev --system
       - name: Install required APT packages
         run: |
-          sudo apt-get update -qy
-          DEPENDENCIES=$( python tests/get_external_apt_dependencies.py )
-          if [ -n "$DEPENDENCIES" ]; then
-              printf "Installing APT packages:\n  $(echo $DEPENDENCIES | sed 's/ /\n  /g')\n"
-              sudo apt-get install -qy $DEPENDENCIES
+          PACKAGES=$(python tests/get_stubtest_system_requirements.py)
+          if [ -n "$PACKAGES" ]; then
+            printf "Installing APT packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
+            sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
           fi
       - name: Create an isolated venv for testing
         run: uv venv .venv
       - name: Install 3rd-party stub dependencies
         run: |
-          DEPENDENCIES=$( python tests/get_external_stub_requirements.py )
-          if [ -n "$DEPENDENCIES" ]; then
-              printf "Installing packages:\n  $(echo $DEPENDENCIES | sed 's/ /\n  /g')\n"
-              uv pip install --python-version ${{ matrix.python-version }} $DEPENDENCIES
+          PACKAGES=$(python tests/get_external_stub_requirements.py)
+          if [ -n "$PACKAGES" ]; then
+              printf "Installing python packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
+              uv pip install --python-version ${{ matrix.python-version }} $PACKAGES
           fi
       - name: Activate the isolated venv for the rest of the job
         run: echo "$PWD/.venv/bin" >> $GITHUB_PATH
@@ -186,6 +165,8 @@ jobs:
           # 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