Merge branch 'main' into dict_signatures

Author: randolf-scholz

.github/workflows/daily.yml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
         exclude:
           # https://github.com/python/typeshed/issues/15694
           - os: "windows-latest"

.github/workflows/mypy_primer.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        shard-index: [0, 1, 2, 3]
+        shard-index: [0, 1, 2, 3, 4, 5]
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
@@ -52,7 +52,7 @@ jobs:
             --new v${MYPY_VERSION} --old v${MYPY_VERSION} \
             --custom-typeshed-repo typeshed_to_test \
             --new-typeshed $GITHUB_SHA --old-typeshed upstream_main \
-            --num-shards 4 --shard-index ${{ matrix.shard-index }} \
+            --num-shards 6 --shard-index ${{ matrix.shard-index }} \
             --debug \
             --output concise \
             | tee diff_${{ matrix.shard-index }}.txt

.github/workflows/stubtest_stdlib.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
         exclude:
           # https://github.com/python/typeshed/issues/15694
           - os: "windows-latest"

.github/workflows/tests.yml

@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         platform: ["linux", "win32", "darwin"]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
@@ -83,6 +83,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        # TODO: Add 3.15 once pyright CI can avoid installing third-party
+        # runtime dependency stacks that do not support Python 3.15 yet.
         python-platform: ["Linux", "Windows", "Darwin"]
         python-version: ["3.11", "3.12", "3.13", "3.14"]
       fail-fast: false

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
           - "--unsafe-fixes"
         files: '.*test_cases/.+\.py$'
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.3.1
+    rev: 26.5.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
@@ -36,7 +36,7 @@ repos:
       - id: flake8
         language: python
         additional_dependencies:
-          - "flake8-pyi==25.5.0"
+          - "flake8-pyi==26.5.0"
         types: [file]
         types_or: [python, pyi]
   - repo: meta

CONTRIBUTING.md

@@ -366,10 +366,6 @@ Features from the `typing` module that are not present in all
 supported Python versions must be imported from `typing_extensions`
 instead in typeshed stubs. This currently affects:
 
-- `TypeAlias` (new in Python 3.10)
-- `Concatenate` (new in Python 3.10)
-- `ParamSpec` (new in Python 3.10)
-- `TypeGuard` (new in Python 3.10)
 - `Self` (new in Python 3.11)
 - `Never` (new in Python 3.11)
 - `LiteralString` (new in Python 3.11)

lib/ts_utils/py315.py

@@ -0,0 +1,20 @@
+"""Helpers for Python 3.15 test infrastructure."""
+
+# These stubs require runtime dependencies that do not install cleanly on Python 3.15 yet.
+PY315_INCOMPATIBLE_RUNTIME_DEPENDENCIES = {
+    # Depend on numpy, which does not provide Python 3.15 wheels yet.
+    "JACK-Client",
+    "geopandas",
+    "hnswlib",
+    "networkx",
+    "pycocotools",
+    "resampy",
+    "shapely",
+    "tensorflow",
+    # Depends on referencing, which depends on rpds-py. rpds-py currently uses
+    # PyO3, which rejects Python 3.15.
+    "jsonschema",
+    # Depends on matplotlib, which depends on contourpy. contourpy does not
+    # provide Python 3.15 wheels yet.
+    "seaborn",
+}

pyproject.toml

@@ -9,6 +9,7 @@ requires-python = ">=3.10" # Minimum version to run tests, used by uv run
 line-length = 130
 target-version = ["py310"]
 skip-magic-trailing-comma = true
+preview = true
 
 [tool.ruff]
 line-length = 130
@@ -147,12 +148,6 @@ extend-safe-fixes = [
     "UP036", # Remove unnecessary `sys.version_info` blocks
 ]
 ignore = [
-    ###
-    # TODO: Disabled temporarily, until Python 3.9 support is fully removed in
-    # May 2026.
-    ###
-    "UP035", # import from typing
-    "UP036", # Remove unnecessary `sys.version_info` blocks
     ###
     # Rules that can conflict with the formatter (Black)
     # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
@@ -238,6 +233,7 @@ ignore = [
     "D", # pydocstyle
     # See comment on black's force-exclude config above
     "E501", # Line too long
+    "UP036", # Remove unnecessary `sys.version_info` blocks
 ]
 
 [tool.ruff.lint.pydocstyle]

requirements-tests.txt

@@ -1,18 +1,19 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
-mypy==1.20.0
-pyright==1.1.408
+mypy==2.1.0
+pyright==1.1.409
 
 # Libraries used by our various scripts.
 aiohttp==3.13.5
-grpcio-tools>=1.76.0 # For grpc_tools.protoc
-mypy-protobuf==5.0.0
+grpcio-tools>=1.76.0; python_version < "3.15" # For grpc_tools.protoc
+mypy-protobuf==5.0.0; python_version < "3.15"
 packaging==26.0
 pathspec>=1.1.1
 pre-commit
-# Required by create_baseline_stubs.py. Must match .pre-commit-config.yaml.
+# Required by create_baseline_stubs.py.
+# stubdefaulter depends on libcst, which does not yet install cleanly on Python 3.15.
 ruff==0.15.8
-stubdefaulter==0.1.0
+stubdefaulter==0.1.0; python_version < "3.15"
 termcolor>=2.3
 tomli==2.4.1; python_version < "3.11"
 tomlkit==0.14.0

scripts/sync_protobuf/_utils.py

@@ -4,19 +4,21 @@
 import sys
 from collections.abc import Iterable
 from http.client import HTTPResponse
+from importlib.metadata import PackageNotFoundError, version
 from pathlib import Path
 from typing import TYPE_CHECKING
 from urllib.request import urlopen
 from zipfile import ZipFile
 
-from mypy_protobuf.main import (  # type: ignore[import-untyped]  # pyright: ignore[reportMissingTypeStubs]
-    __version__ as mypy_protobuf__version__,
-)
+try:
+    _mypy_protobuf_version = version("mypy-protobuf")
+except PackageNotFoundError:
+    _mypy_protobuf_version = "unavailable"
 
 if TYPE_CHECKING:
     from _typeshed import StrOrBytesPath, StrPath
 
-MYPY_PROTOBUF_VERSION = mypy_protobuf__version__
+MYPY_PROTOBUF_VERSION = _mypy_protobuf_version
 
 
 def download_file(url: str, destination: Path) -> None: