Merge branch 'main' into structured-obsolete-since

Author: srittau

.github/workflows/daily.yml

@@ -36,6 +36,10 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        exclude:
+          # https://github.com/python/typeshed/issues/15694
+          - os: "windows-latest"
+            python-version: "3.10"
       fail-fast: false
 
     steps:

.github/workflows/stubtest_stdlib.yml

@@ -32,6 +32,10 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        exclude:
+          # https://github.com/python/typeshed/issues/15694
+          - os: "windows-latest"
+            python-version: "3.10"
       fail-fast: false
 
     steps:

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, cast, final
-from typing_extensions import TypeGuard
+from typing import Annotated, Any, Final, NamedTuple, TypeGuard, cast, final
 
 if sys.version_info >= (3, 11):
     import tomllib

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

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

scripts/stubsabot.py

@@ -22,8 +22,8 @@
 from dataclasses import dataclass, field
 from http import HTTPStatus
 from pathlib import Path
-from typing import Annotated, Any, ClassVar, Literal, NamedTuple, TypedDict, TypeVar, cast
-from typing_extensions import Self, TypeAlias
+from typing import Annotated, Any, ClassVar, Literal, NamedTuple, TypeAlias, TypedDict, TypeVar, cast
+from typing_extensions import Self
 
 if sys.version_info >= (3, 11):
     import tomllib

stdlib/@tests/stubtest_allowlists/py314.txt

@@ -132,6 +132,7 @@ importlib.metadata.DeprecatedNonAbstract.__new__
 importlib.resources._common.files
 
 sys._monitoring  # Doesn't really exist. See comments in the stub.
+sys.__jit        # Similar to sys._monitoring
 sys.last_exc  # not always defined
 
 # These only exist to give a better error message if you try to subclass an instance

stdlib/@tests/test_cases/check_functools.py

@@ -1,12 +1,16 @@
 from __future__ import annotations
 
-from functools import cache, cached_property, wraps
-from typing import Callable, TypeVar
-from typing_extensions import ParamSpec, assert_type
+from functools import cache, cached_property, lru_cache, wraps
+from typing import Callable, ParamSpec, TypeVar
+from typing_extensions import assert_type
 
 P = ParamSpec("P")
 T_co = TypeVar("T_co", covariant=True)
 
+#
+# Tests for @wraps
+#
+
 
 def my_decorator(func: Callable[P, T_co]) -> Callable[P, T_co]:
     @wraps(func)
@@ -54,6 +58,57 @@ def func_wrapper(x: int) -> None: ...
     func_wrapper(3)
 
 
+#
+# Tests for @cache
+#
+
+
+@cache
+def check_cache(x: int) -> int:
+    return x * 2
+
+
+assert_type(check_cache(3), int)
+# Type checkers should check the argument type, but this is currently not
+# possible. See https://github.com/python/typeshed/issues/6347 and
+# https://github.com/python/typeshed/issues/11280.
+# check_cached("invalid")  # xtype: ignore
+
+assert_type(check_cache.cache_info().misses, int)
+
+
+#
+# Tests for @lru_cache
+#
+
+
+@lru_cache
+def check_lru_cache(x: int) -> int:
+    return x * 2
+
+
+@lru_cache(maxsize=32)
+def check_lru_cache_with_maxsize(x: int) -> int:
+    return x * 2
+
+
+assert_type(check_lru_cache(3), int)
+assert_type(check_lru_cache_with_maxsize(3), int)
+# Type checkers should check the argument type, but this is currently not
+# possible. See https://github.com/python/typeshed/issues/6347 and
+# https://github.com/python/typeshed/issues/11280.
+# check_lru_cache("invalid")  # xtype: ignore
+# check_lru_cache_with_maxsize("invalid")  # xtype: ignore
+
+assert_type(check_lru_cache.cache_info().misses, int)
+assert_type(check_lru_cache_with_maxsize.cache_info().misses, int)
+
+
+#
+# Tests for @cached_property
+#
+
+
 class A:
     def __init__(self, x: int):
         self.x = x

stdlib/@tests/test_cases/check_importlib_metadata.py

@@ -1,28 +1,28 @@
 from __future__ import annotations
 
-import sys
 from _typeshed import StrPath
+from importlib.metadata._meta import SimplePath
 from os import PathLike
 from pathlib import Path
 from zipfile import Path as ZipPath
 
-if sys.version_info >= (3, 10):
-    from importlib.metadata._meta import SimplePath
 
-    # Simplified version of zipfile.Path
-    class MyPath:
-        @property
-        def parent(self) -> PathLike[str]: ...  # undocumented
+# Simplified version of zipfile.Path
+class MyPath:
+    @property
+    def parent(self) -> PathLike[str]: ...  # undocumented
 
-        def read_text(self, encoding: str | None = ..., errors: str | None = ...) -> str: ...
-        def read_bytes(self) -> bytes: ...
-        def joinpath(self, *other: StrPath) -> MyPath: ...
-        def __truediv__(self, add: StrPath) -> MyPath: ...
-        def exists(self) -> bool: ...
+    def read_text(self, encoding: str | None = ..., errors: str | None = ...) -> str: ...
+    def read_bytes(self) -> bytes: ...
+    def joinpath(self, *other: StrPath) -> MyPath: ...
+    def __truediv__(self, add: StrPath) -> MyPath: ...
+    def exists(self) -> bool: ...
 
-    def takes_simple_path(p: SimplePath) -> None: ...
 
-    takes_simple_path(Path())
-    takes_simple_path(ZipPath(""))
-    takes_simple_path(MyPath())
-    takes_simple_path("some string")  # type: ignore
+def takes_simple_path(p: SimplePath) -> None: ...
+
+
+takes_simple_path(Path())
+takes_simple_path(ZipPath(""))
+takes_simple_path(MyPath())
+takes_simple_path("some string")  # type: ignore

stdlib/@tests/test_cases/check_io.py

@@ -1,9 +1,17 @@
-from _io import BufferedReader
+from _io import BufferedReader, BufferedRWPair, BufferedWriter
 from gzip import GzipFile
 from io import FileIO, RawIOBase, TextIOWrapper
+from socket import SocketIO
+from typing import Any
 from typing_extensions import assert_type
 
+socket: Any = None
+
 BufferedReader(RawIOBase())
+BufferedWriter(RawIOBase())
+BufferedWriter(SocketIO(socket, "r"))
+
+BufferedRWPair(open("", "rb"), open("", "wb"))
 
 assert_type(TextIOWrapper(FileIO("")).buffer, FileIO)
 assert_type(TextIOWrapper(FileIO(13)).detach(), FileIO)