Merge branch 'main' into fix/15619-pyserial-read-all-cannot-return-none

Author: srittau

.github/workflows/daily.yml

@@ -35,7 +35,11 @@ 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"
+            python-version: "3.10"
       fail-fast: false
 
     steps:

.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,11 @@ 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"
+            python-version: "3.10"
       fail-fast: false
 
     steps:

.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

@@ -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/metadata.py

@@ -13,8 +13,7 @@
 from collections.abc import Mapping
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Annotated, Any, Final, NamedTuple, final
-from typing_extensions import TypeGuard
+from typing import Annotated, Any, Final, NamedTuple, TypeGuard, cast, final
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -239,27 +238,32 @@ def read_metadata(distribution: str) -> StubMetadata:
     """
     try:
         with metadata_path(distribution).open("rb") as f:
-            data = tomlkit.load(f)
+            # This cast is necessary for pyright to understand that the
+            # variable is a dict with object values. Just using
+            # `data: dict[str, object] = tomlkit.load(f)` doesn't work because
+            # pyright still infers TOMLDocument which derives from
+            # dict[Unknown, Unknown].
+            data = cast(dict[str, object], tomlkit.load(f))
     except FileNotFoundError:
         raise NoSuchStubError(f"Typeshed has no stubs for {distribution!r}!") from None
 
     unknown_metadata_fields = data.keys() - _KNOWN_METADATA_FIELDS
     assert not unknown_metadata_fields, f"Unexpected keys in METADATA.toml for {distribution!r}: {unknown_metadata_fields}"
 
     assert "version" in data, f"Missing 'version' field in METADATA.toml for {distribution!r}"
-    version: object = data.get("version")  # pyright: ignore[reportUnknownMemberType]
+    version = data.get("version")
     assert isinstance(version, str) and len(version) > 0, f"Invalid 'version' field in METADATA.toml for {distribution!r}"
     # Check that the version spec parses
     if version[0].isdigit():
         version = f"=={version}"
     version_spec = Specifier(version)
     assert version_spec.operator in {"==", "~="}, f"Invalid 'version' field in METADATA.toml for {distribution!r}"
 
-    dependencies_s: object = data.get("dependencies", [])  # pyright: ignore[reportUnknownMemberType]
+    dependencies_s = data.get("dependencies", [])
     assert isinstance(dependencies_s, list)
     dependencies = [parse_dependencies(distribution, dep) for dep in dependencies_s]
 
-    extra_description: object = data.get("extra-description")  # pyright: ignore[reportUnknownMemberType]
+    extra_description = data.get("extra-description")
     assert isinstance(extra_description, (str, type(None)))
 
     if "stub-distribution" in data:
@@ -269,7 +273,7 @@ def read_metadata(distribution: str) -> StubMetadata:
     else:
         stub_distribution = f"types-{distribution}"
 
-    upstream_repository: object = data.get("upstream-repository")  # pyright: ignore[reportUnknownMemberType]
+    upstream_repository = data.get("upstream-repository")
     assert isinstance(upstream_repository, (str, type(None)))
     if isinstance(upstream_repository, str):
         parsed_url = urllib.parse.urlsplit(upstream_repository)
@@ -293,7 +297,7 @@ def read_metadata(distribution: str) -> StubMetadata:
             )
             assert num_url_path_parts == 2, bad_github_url_msg
 
-    obsolete_since: object = data.get("obsolete-since")  # pyright: ignore[reportUnknownMemberType]
+    obsolete_since = data.get("obsolete-since")
     assert isinstance(obsolete_since, (String, type(None)))
     if obsolete_since:
         comment = obsolete_since.trivia.comment
@@ -302,13 +306,13 @@ def read_metadata(distribution: str) -> StubMetadata:
         obsolete = ObsoleteMetadata(since_version=obsolete_since, since_date=since_date)
     else:
         obsolete = None
-    no_longer_updated: object = data.get("no-longer-updated", False)  # pyright: ignore[reportUnknownMemberType]
+    no_longer_updated = data.get("no-longer-updated", False)
     assert type(no_longer_updated) is bool
-    uploaded_to_pypi: object = data.get("upload", True)  # pyright: ignore[reportUnknownMemberType]
+    uploaded_to_pypi = data.get("upload", True)
     assert type(uploaded_to_pypi) is bool
-    partial_stub: object = data.get("partial-stub", True)  # pyright: ignore[reportUnknownMemberType]
+    partial_stub = data.get("partial-stub", True)
     assert type(partial_stub) is bool
-    requires_python_str: object = data.get("requires-python")  # pyright: ignore[reportUnknownMemberType]
+    requires_python_str = data.get("requires-python")
     oldest_supported_python = get_oldest_supported_python()
     oldest_supported_python_specifier = Specifier(f">={oldest_supported_python}")
     if requires_python_str is None:
@@ -324,11 +328,11 @@ def read_metadata(distribution: str) -> StubMetadata:
         assert requires_python.operator == ">=", "'requires-python' should be a minimum version specifier, use '>=3.x'"
 
     empty_tools: dict[object, object] = {}
-    tools_settings: object = data.get("tool", empty_tools)  # pyright: ignore[reportUnknownMemberType]
+    tools_settings = data.get("tool", empty_tools)
     assert isinstance(tools_settings, dict)
     assert tools_settings.keys() <= _KNOWN_METADATA_TOOL_FIELDS.keys(), f"Unrecognised tool for {distribution!r}"
     for tool, tk in _KNOWN_METADATA_TOOL_FIELDS.items():
-        settings_for_tool: object = tools_settings.get(tool, {})  # pyright: ignore[reportUnknownMemberType]
+        settings_for_tool = cast(dict[str, object], tools_settings).get(tool, {})
         assert isinstance(settings_for_tool, dict)
         for key in settings_for_tool:
             assert key in tk, f"Unrecognised {tool} key {key!r} for {distribution!r}"
@@ -349,23 +353,28 @@ def read_metadata(distribution: str) -> StubMetadata:
     )
 
 
-def update_metadata(distribution: str, **new_values: object) -> tomlkit.TOMLDocument:
+def update_metadata(distribution: str, **new_values: object) -> dict[str, object]:
     """Update a distribution's METADATA.toml.
 
     Return the updated TOML dictionary for use without having to open the file separately.
     """
     path = metadata_path(distribution)
     try:
-        with path.open("rb") as file:
-            data = tomlkit.load(file)
+        with path.open("rb") as f:
+            # This cast is necessary for pyright to understand that the
+            # variable is a dict with object values. Just using
+            # `data: dict[str, object] = tomlkit.load(f)` doesn't work because
+            # pyright still infers TOMLDocument which derives from
+            # dict[Unknown, Unknown].
+            data = cast(dict[str, object], tomlkit.load(f))
     except FileNotFoundError:
         raise NoSuchStubError(f"Typeshed has no stubs for {distribution!r}!") from None
-    data.update(new_values)  # pyright: ignore[reportUnknownMemberType] # tomlkit.TOMLDocument.update is partially typed
+    data.update(new_values)
     for key in list(data.keys()):
-        new_key = key.replace("_", "-")  # pyright: ignore[reportUnknownMemberType] # tomlkit.TOMLDocument.keys is partially typed
-        data[new_key] = data.pop(key)  # pyright: ignore[reportUnknownMemberType] # tomlkit.TOMLDocument.pop is partially typed
-    with path.open("w", encoding="UTF-8") as file:
-        tomlkit.dump(data, file)  # pyright: ignore[reportUnknownMemberType] # tomlkit.dump has partially unknown Mapping type
+        new_key = key.replace("_", "-")
+        data[new_key] = data.pop(key)
+    with path.open("w", encoding="UTF-8") as f:
+        tomlkit.dump(data, f)  # pyright: ignore[reportUnknownMemberType] # tomlkit.dump has partially unknown Mapping type
     return data
 
 

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",
+}

lib/ts_utils/utils.py

@@ -9,8 +9,7 @@
 from collections.abc import Iterable, Mapping
 from pathlib import Path
 from types import MethodType
-from typing import TYPE_CHECKING, Any, Final, NamedTuple
-from typing_extensions import TypeAlias
+from typing import TYPE_CHECKING, Any, Final, NamedTuple, TypeAlias
 
 import pathspec
 from packaging.requirements import Requirement
@@ -261,12 +260,12 @@ def close(self: TemporaryFileWrapper[str]) -> None:
 
 
 @functools.cache
-def get_gitignore_spec() -> pathspec.PathSpec:
+def get_gitignore_spec() -> pathspec.GitIgnoreSpec:
     with GITIGNORE_PATH.open(encoding="UTF-8") as f:
         return pathspec.GitIgnoreSpec.from_lines(f)
 
 
-def spec_matches_path(spec: pathspec.PathSpec, path: Path) -> bool:
+def spec_matches_path(spec: pathspec.PathSpec[Any], path: Path) -> bool:
     normalized_path = path.as_posix()
     if path.is_dir():
         normalized_path += "/"

pyproject.toml

@@ -106,7 +106,7 @@ select = [
     "PYI044", # `from __future__ import annotations` has no effect in stub files, since type checkers automatically treat stubs as having those semantics
     "PYI055", # Multiple `type[T]` usages in a union. Combine them into one, e.g., `type[{union_str}]`.
     "PYI058", # Use `{return_type}` as the return value for simple `{method}` methods
-    # "PYI059", # TODO: Add when dropping Python 3.9 support
+    "PYI059", # Checks for classes inheriting from typing.Generic[] where Generic[] is not the last base class in the bases tuple
     "PYI061", # Use `None` rather than `Literal[None]`
     "PYI062", # Duplicate literal member `{}`
     "PYI064", # `Final[Literal[{literal}]]` can be replaced with a bare Final
@@ -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]