Merge branch 'main' into mypy-2.0.0

Author: srittau

.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/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
@@ -71,7 +71,9 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
-          python-version: "3.14"
+          python-version: "3.15"
+          allow-prereleases: true
+          check-latest: true
       - uses: astral-sh/setup-uv@v7
         with:
           version-file: "requirements-tests.txt"
@@ -83,6 +85,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

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

@@ -147,12 +147,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 +232,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

@@ -5,14 +5,15 @@ 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:

stdlib/@tests/stubtest_allowlists/common.txt

@@ -6,9 +6,6 @@
 
 importlib.abc.MetaPathFinder.find_spec  # Not defined on the actual class, but expected to exist.
 importlib.abc.PathEntryFinder.find_spec  # Not defined on the actual class, but expected to exist.
-tkinter.simpledialog.[A-Z_]+
-tkinter.simpledialog.TclVersion
-tkinter.simpledialog.TkVersion
 tarfile.TarInfo.__slots__  # it's a big dictionary at runtime and the dictionary values are a bit long
 
 
@@ -457,17 +454,6 @@ typing(_extensions)?\.TextIO\.newlines
 typing(_extensions)?\.IO\.__iter__
 typing(_extensions)?\.IO\.__next__
 
-# typing.IO uses positional-or-keyword arguments, but in the stubs we prefer
-# to mark these as positional-only for compatibility with existing sub-classes.
-typing(_extensions)?\.BinaryIO\.write
-typing(_extensions)?\.IO\.read
-typing(_extensions)?\.IO\.readline
-typing(_extensions)?\.IO\.readlines
-typing(_extensions)?\.IO\.seek
-typing(_extensions)?\.IO\.truncate
-typing(_extensions)?\.IO\.write
-typing(_extensions)?\.IO\.writelines
-
 types.MethodType.__closure__  # read-only but not actually a property; stubtest thinks it doesn't exist.
 types.MethodType.__code__  # read-only but not actually a property; stubtest thinks it doesn't exist.
 types.MethodType.__defaults__  # read-only but not actually a property; stubtest thinks it doesn't exist.
@@ -499,7 +485,3 @@ xml.etree.ElementTree.XMLParser.__init__  # Defined in C so has general signatur
 # Iterable classes that don't define __iter__ at runtime (usually iterable via __getitem__)
 # These would ideally be special-cased by type checkers; see https://github.com/python/mypy/issues/2220
 xml.etree.ElementTree.Element.__iter__
-
-# These three have a pos-or-keyword first parameter at runtime, but deliberately have a pos-only first parameter in the stub. #6812
-posixpath.join
-ntpath.join

stdlib/@tests/stubtest_allowlists/darwin-py315.txt

@@ -0,0 +1,29 @@
+# ============================================
+# TODO: Allowlist entries that should be fixed
+# ============================================
+
+_decimal.SPEC_VERSION
+_pyrepl.fancy_termios
+_pyrepl.unix_console
+_pyrepl.unix_eventqueue
+ctypes.c_double_complex._type_
+ctypes.c_float_complex._type_
+ctypes.c_longdouble_complex._type_
+decimal.SPEC_VERSION
+mmap.MS_ASYNC
+mmap.MS_INVALIDATE
+mmap.MS_SYNC
+mmap.mmap.madvise
+mmap.mmap.resize
+os.NODEV
+os.__all__
+posix.NODEV
+profiling.sampling.live_collector
+profiling.sampling.live_collector.collector
+profiling.sampling.live_collector.constants
+profiling.sampling.live_collector.display
+profiling.sampling.live_collector.trend_tracker
+profiling.sampling.live_collector.widgets
+readline.get_pre_input_hook
+resource.RLIM_SAVED_CUR
+resource.RLIM_SAVED_MAX