Merge branch 'main' into configparser-default-section-none

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.

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/configparser.pyi

@@ -1,6 +1,6 @@
 import sys
 from _typeshed import BytesPath, GenericPath, MaybeNone, StrOrBytesPath, StrPath, SupportsWrite
-from collections.abc import Callable, ItemsView, Iterable, Iterator, Mapping, MutableMapping, Sequence
+from collections.abc import Callable, ItemsView, Iterable, Iterator, Mapping, MutableMapping, Sequence, ValuesView
 from re import Pattern
 from typing import Any, AnyStr, ClassVar, Final, Literal, TypeAlias, TypeVar, overload, type_check_only
 from typing_extensions import deprecated
@@ -333,6 +333,7 @@ class RawConfigParser(_Parser):
     @overload
     def items(self, section: _SectionName, raw: bool = False, vars: _Section | None = None) -> list[tuple[str, str]]: ...
 
+    def values(self) -> ValuesView[SectionProxy]: ...
     def set(self, section: _SectionName, option: str, value: str | None = None) -> None: ...
     def write(self, fp: SupportsWrite[str], space_around_delimiters: bool = True) -> None: ...
     def remove_option(self, section: _SectionName, option: str) -> bool: ...

stdlib/sys/__init__.pyi

@@ -42,6 +42,7 @@ excepthook: Callable[[type[BaseException], BaseException, TracebackType | None],
 exec_prefix: str
 executable: str
 float_repr_style: Literal["short", "legacy"]
+_framework: str  # empty string on non-macOS platforms
 hexversion: int
 last_type: type[BaseException] | None
 last_value: BaseException | None

stubs/JACK-Client/METADATA.toml

@@ -5,9 +5,7 @@ dependencies = ["numpy>=1.20", "types-cffi"]
 
 [tool.stubtest]
 # darwin and win32 are equivalent
-# TODO (2026-06-26): darwin temporarily disabled, see
-# https://github.com/python/typeshed/issues/15947
-ci-platforms = ["linux"]
+ci-platforms = ["darwin", "linux"]
 apt-dependencies = ["libjack-dev"]
 brew-dependencies = ["jack"]
 # No need to install on the CI. Leaving here as information for Windows contributors.

stubs/braintree/braintree/search.pyi

@@ -1,4 +1,5 @@
 from _typeshed import Incomplete
+from typing import overload
 
 class Search:
     class IsNodeBuilder:
@@ -41,7 +42,12 @@ class Search:
         name: Incomplete
         whitelist: Incomplete
         def __init__(self, name, whitelist=[]) -> None: ...
-        def in_list(self, *values): ...
+
+        @overload
+        def in_list(self, value: list[str]) -> Search.Node: ...
+        @overload
+        def in_list(self, *values: str) -> Search.Node: ...
+
         def __eq__(self, value): ...
 
     class MultipleValueOrTextNodeBuilder(TextNodeBuilder, MultipleValueNodeBuilder):

stubs/docker/docker/models/containers.pyi

@@ -22,7 +22,7 @@ class Container(Model):
     @property
     def image(self) -> Image | None: ...
     @property
-    def labels(self): ...
+    def labels(self) -> dict[str, str]: ...
     @property
     def status(self) -> str: ...
     @property

stubs/docutils/@tests/stubtest_allowlist.txt

@@ -14,6 +14,7 @@ docutils.transforms.Transform.apply # method apply is not implemented
 docutils.transforms.Transform.__getattr__
 docutils.TransformSpec.unknown_reference_resolvers
 docutils.writers.latex2e.PreambleCmds... contents
+docutils.writers.latex2e.PreambleCmds.inline role \w+  # attribute names with spaces, set with setattr() from docutils.sty
 
 # Files that don't exist at runtime of stubtests, raises ImportError:
 docutils.parsers.commonmark_wrapper

stubs/docutils/METADATA.toml

@@ -1,2 +1,2 @@
-version = "0.22.3"
+version = "0.23"
 upstream-repository = "https://sourceforge.net/p/docutils/code"

stubs/docutils/docutils/core.pyi

@@ -2,8 +2,8 @@ from _typeshed import Incomplete, StrPath
 from typing import Final
 from typing_extensions import deprecated
 
-from docutils import SettingsSpec
-from docutils.io import FileInput, Input, Output
+from docutils import SettingsSpec, nodes
+from docutils.io import Input, Output
 from docutils.parsers import Parser
 from docutils.readers import Reader
 from docutils.utils import SystemMessage
@@ -12,24 +12,24 @@ from docutils.writers import Writer, _WriterParts
 __docformat__: Final = "reStructuredText"
 
 class Publisher:
-    document: Incomplete | None
+    document: nodes.document | None
     reader: Reader[Incomplete]
     parser: Parser
     writer: Writer[Incomplete]
     source: Input[Incomplete]
-    source_class: Incomplete
+    source_class: type[Input[Incomplete]]
     destination: Output | None
-    destination_class: Incomplete
+    destination_class: type[Output]
     settings: dict[str, Incomplete]
     def __init__(
         self,
         reader: Reader[Incomplete] | None = None,
         parser: Parser | None = None,
         writer: Writer[Incomplete] | None = None,
         source: Input[Incomplete] | None = None,
-        source_class=...,
+        source_class: type[Input[Incomplete]] = ...,
         destination: Output | None = None,
-        destination_class=...,
+        destination_class: type[Output] = ...,
         settings: dict[str, Incomplete] | None = None,
     ) -> None: ...
     def set_reader(self, reader: str, parser: Parser | None = None, parser_name: str | None = None) -> None: ...
@@ -129,7 +129,7 @@ def publish_string(
 def publish_parts(
     source,
     source_path: StrPath | None = None,
-    source_class=...,
+    source_class: type[Input[Incomplete]] = ...,
     destination_path: StrPath | None = None,
     reader=None,
     reader_name: str | None = None,
@@ -146,7 +146,7 @@ def publish_parts(
 def publish_doctree(
     source,
     source_path: StrPath | None = None,
-    source_class=...,
+    source_class: type[Input[Incomplete]] = ...,
     reader=None,
     reader_name: str | None = None,
     parser=None,
@@ -185,13 +185,13 @@ def publish_cmdline_to_binary(
     usage: str = "%prog [options] [<source> [<destination>]]",
     description: str = ...,
     destination=None,
-    destination_class=...,
+    destination_class: type[Output] = ...,
 ): ...
 def publish_programmatically(
-    source_class: type[FileInput],
+    source_class: type[Input[Incomplete]],
     source,
     source_path: StrPath | None,
-    destination_class,
+    destination_class: type[Output],
     destination,
     destination_path: StrPath | None,
     reader,