Merge branch 'main' into protobuf-decoder-factories

Author: srittau

CONTRIBUTING.md

@@ -235,6 +235,12 @@ when running stubtest. For example: `mypy-plugins = ["mypy_django_plugin.main"]`
 * `mypy-plugins-config` (default: `{}`): A dictionary mapping plugin names to their
 configuration dictionaries for use by mypy plugins. For example:
 `mypy-plugins-config = {"django-stubs" = {"django_settings_module" = "@tests.django_settings"}}`
+* `install-environment` (default: `{}`): A dictionary of environment variables
+  to set while `pip install`ing the package and its dependencies for stubtest.
+  Useful for packages that read build-time options from the environment, for
+  example to disable CPU-specific compiler flags that do not survive CI's
+  shared wheel cache. For example:
+  `install-environment = { HNSWLIB_NO_NATIVE = "1" }`
 
 `*-dependencies` are usually packages needed to `pip install` the implementation
 distribution.
@@ -370,7 +376,7 @@ Use `@deprecated` if and only if
 
 - a feature is deprecated at runtime (either using `@deprecated` or with a
   runtime warning); or
-- a feature is documented to be deprecated (e.g. in API documention,
+- a feature is documented to be deprecated (e.g. in API documentation,
   docstrings, or comments).
 
 For standard library features that are not deprecated in all Python versions

lib/ts_utils/metadata.py

@@ -53,6 +53,10 @@ def _is_nested_dict(obj: object) -> TypeGuard[dict[str, dict[str, Any]]]:
     return isinstance(obj, dict) and all(isinstance(k, str) and isinstance(v, dict) for k, v in obj.items())
 
 
+def _is_dict_of_strings(obj: object) -> TypeGuard[dict[str, str]]:
+    return isinstance(obj, dict) and all(isinstance(k, str) and isinstance(v, str) for k, v in obj.items())
+
+
 @functools.cache
 def get_oldest_supported_python() -> str:
     with PYPROJECT_PATH.open("rb") as config:
@@ -85,6 +89,7 @@ class StubtestSettings:
     stubtest_dependencies: list[str]
     mypy_plugins: list[str]
     mypy_plugins_config: dict[str, dict[str, Any]]
+    install_environment: dict[str, str]
 
     def system_requirements_for_platform(self, platform: str) -> list[str]:
         assert platform in _STUBTEST_PLATFORM_MAPPING, f"Unrecognised platform {platform!r}"
@@ -110,6 +115,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings:
     stubtest_dependencies: object = data.get("stubtest-dependencies", [])
     mypy_plugins: object = data.get("mypy-plugins", [])
     mypy_plugins_config: object = data.get("mypy-plugins-config", {})
+    install_environment: object = data.get("install-environment", {})
 
     assert type(skip) is bool
     assert type(ignore_missing_stub) is bool
@@ -124,6 +130,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings:
     assert _is_list_of_strings(stubtest_dependencies)
     assert _is_list_of_strings(mypy_plugins)
     assert _is_nested_dict(mypy_plugins_config)
+    assert _is_dict_of_strings(install_environment)
 
     unrecognised_platforms = set(ci_platforms) - _STUBTEST_PLATFORM_MAPPING.keys()
     assert not unrecognised_platforms, f"Unrecognised ci-platforms specified for {distribution!r}: {unrecognised_platforms}"
@@ -152,6 +159,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings:
         stubtest_dependencies=stubtest_dependencies,
         mypy_plugins=mypy_plugins,
         mypy_plugins_config=mypy_plugins_config,
+        install_environment=install_environment,
     )
 
 
@@ -227,6 +235,7 @@ def all_dependencies(self) -> list[Requirement]:
         "stubtest-dependencies",
         "mypy-plugins",
         "mypy-plugins-config",
+        "install-environment",
     }
 }
 _DIST_NAME_RE: Final = re.compile(r"^[a-z0-9]([a-z0-9._-]*[a-z0-9])?$", re.IGNORECASE)

stdlib/@tests/stubtest_allowlists/common.txt

@@ -157,7 +157,6 @@ _ctypes.CFuncPtr  # stubtest erroneously thinks it can't be subclassed
 _frozen_importlib_external.ExtensionFileLoader.get_filename
 _frozen_importlib_external.FileLoader.get_filename
 _frozen_importlib_external.FileLoader.get_resource_reader
-_frozen_importlib_external.FileLoader.load_module
 
 # Mismatch of default values of `report` parameter:
 _markupbase.ParserBase.parse_comment
@@ -277,7 +276,6 @@ importlib._abc.Loader.exec_module  # See Lib/importlib/_abc.py. Might be defined
 
 # runtime is *args, **kwargs due to a wrapper; we have more accurate signatures in the stubs
 importlib.abc.FileLoader.get_filename
-importlib.abc.FileLoader.load_module
 
 importlib.metadata._meta.SimplePath.joinpath  # Runtime definition of protocol is incorrect
 

stdlib/@tests/stubtest_allowlists/py310.txt

@@ -162,6 +162,10 @@ typing(_extensions)?\.IO\.writelines
 posixpath.join
 ntpath.join
 
+# runtime is *args, **kwargs due to a wrapper; we have more accurate signatures in the stubs
+_frozen_importlib_external.FileLoader.load_module
+importlib.abc.FileLoader.load_module
+
 
 # ===============================================================
 # Allowlist entries that cannot or should not be fixed; 3.10 only

stdlib/@tests/stubtest_allowlists/py311.txt

@@ -140,6 +140,10 @@ typing(_extensions)?\.IO\.writelines
 posixpath.join
 ntpath.join
 
+# runtime is *args, **kwargs due to a wrapper; we have more accurate signatures in the stubs
+_frozen_importlib_external.FileLoader.load_module
+importlib.abc.FileLoader.load_module
+
 
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; >= 3.11

stdlib/@tests/stubtest_allowlists/py312.txt

@@ -133,6 +133,10 @@ typing(_extensions)?\.IO\.writelines
 posixpath.join
 ntpath.join
 
+# runtime is *args, **kwargs due to a wrapper; we have more accurate signatures in the stubs
+_frozen_importlib_external.FileLoader.load_module
+importlib.abc.FileLoader.load_module
+
 
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; >= 3.12

stdlib/@tests/stubtest_allowlists/py313.txt

@@ -91,6 +91,10 @@ typing(_extensions)?\.IO\.writelines
 posixpath.join
 ntpath.join
 
+# runtime is *args, **kwargs due to a wrapper; we have more accurate signatures in the stubs
+_frozen_importlib_external.FileLoader.load_module
+importlib.abc.FileLoader.load_module
+
 
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; >= 3.13

stdlib/@tests/stubtest_allowlists/py314.txt

@@ -24,13 +24,6 @@ concurrent.interpreters._crossinterp.UNBOUND_REMOVE
 # Condition functions are exported in __init__
 threading.Condition.locked
 
-# Starting with Python 3.14.1, these methods accept None for some of their
-# parameters, but would raise a TypeError with Python 3.14.0.
-mmap.mmap.find
-mmap.mmap.flush
-mmap.mmap.rfind
-multiprocessing.process.BaseProcess.__init__
-
 # ====================================
 # Pre-existing errors from Python 3.13
 # ====================================
@@ -91,6 +84,10 @@ typing(_extensions)?\.IO\.writelines
 posixpath.join
 ntpath.join
 
+# runtime is *args, **kwargs due to a wrapper; we have more accurate signatures in the stubs
+_frozen_importlib_external.FileLoader.load_module
+importlib.abc.FileLoader.load_module
+
 
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; >= 3.14

stdlib/@tests/stubtest_allowlists/py315.txt

@@ -2,32 +2,13 @@
 # TODO: Allowlist entries that should be fixed
 # ============================================
 
-_frozen_importlib.BuiltinImporter.load_module
-_frozen_importlib.FrozenImporter.load_module
-_frozen_importlib_external.FileFinder.discover
-_frozen_importlib_external.NamespaceLoader.load_module
-_frozen_importlib_external.NamespacePath
 _frozen_importlib_external.PathFinder.discover
 _frozen_importlib_external.SourceFileLoader.source_to_code
 _frozen_importlib_external.SourceLoader.source_to_code
-_frozen_importlib_external._LoaderBasics.load_module
-_frozen_importlib_external.cache_from_source
-_struct.Struct.pack_into
-_struct.pack
-_struct.pack_into
-_thread.RLock.__exit__
-_thread.lock.__exit__
 dataclasses.MISSING
 dataclasses._MISSING_TYPE
 dataclasses.field
-importlib._abc.Loader.load_module
-importlib._bootstrap_external.NamespacePath
-importlib.abc.MetaPathFinder.discover
-importlib.abc.PathEntryFinder.discover
-importlib.resources._common.package_to_anchor
 mailbox._ProxyFile.__class_getitem__
-multiprocessing.process.BaseProcess.__init__
-threading.Condition.locked
 
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; >= 3.15
@@ -90,6 +71,9 @@ concurrent.interpreters._crossinterp.UnboundItem.singleton
 concurrent.interpreters._crossinterp.UNBOUND_ERROR
 concurrent.interpreters._crossinterp.UNBOUND_REMOVE
 
+# Condition functions are exported in __init__
+threading.Condition.locked
+
 # Assigning `__new__` causes `func` not to get recognized.
 functools.partialmethod.__new__
 
@@ -151,9 +135,6 @@ typing_extensions.Protocol  # Super-special typing primitive
 # Allowlist entries that cannot or should not be fixed; >= 3.12
 # =============================================================
 
-# Deprecated argument is supported at runtime by renaming it through a decorator.
-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.

stdlib/@tests/test_cases/check_inspect.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 import inspect
-from collections.abc import Awaitable, Callable, Coroutine
-from types import CoroutineType
+from collections.abc import AsyncGenerator, Awaitable, Callable, Coroutine, Generator
 from typing import Any
 from typing_extensions import assert_type
 
@@ -17,10 +16,24 @@ def test_iscoroutinefunction_inspect(
         assert_type(x, Callable[[str, int], Coroutine[str, int, bytes]])
 
     if inspect.iscoroutinefunction(y):
-        assert_type(y, Callable[[str, int], CoroutineType[Any, Any, bytes]])
+        assert_type(y, Callable[[str, int], Coroutine[Any, Any, bytes]])
 
     if inspect.iscoroutinefunction(z):
-        assert_type(z, Callable[[str, int], CoroutineType[Any, Any, Any]])
+        assert_type(z, Callable[[str, int], Coroutine[Any, Any, Any]])
 
     if inspect.iscoroutinefunction(xx):
-        assert_type(xx, Callable[..., CoroutineType[Any, Any, Any]])
+        assert_type(xx, Callable[..., Coroutine[Any, Any, Any]])
+
+
+def test_isgeneratorfunction_inspect(x: Callable[[str], object], y: object) -> None:
+    if inspect.isgeneratorfunction(x):
+        assert_type(x, Callable[[str], Generator[Any, Any, Any]])
+    if inspect.isgeneratorfunction(y):
+        assert_type(y, Callable[..., Generator[Any, Any, Any]])
+
+
+def test_isasyncgenfunction_inspect(x: Callable[[str], object], y: object) -> None:
+    if inspect.isasyncgenfunction(x):
+        assert_type(x, Callable[[str], AsyncGenerator[Any, Any]])
+    if inspect.isasyncgenfunction(y):
+        assert_type(y, Callable[..., AsyncGenerator[Any, Any]])