Merge branch 'main' into psutil-use-stricter-settings

donbarbos · web-flow · commit 18b78b92cdeb · 2025-12-10T17:17:39.000Z
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -88,3 +88,12 @@ When rejecting a PR for a change for a future Python version, use a message
 like:
 
     Thanks for contributing! Unfortunately, [as outlined in our CONTRIBUTING document](https://github.com/python/typeshed/blob/main/CONTRIBUTING.md#standard-library-stubs) we only accept pull requests to the standard library for future Python versions after the first beta version has been released. This is in part to prevent churn in the stubs, and in part because the testing infrastructure for the future version is not yet in place. Please feel free to open a new PR when the first beta version has been released. Alternatively, if this PR is still relevant, you can leave a comment here to reopen it.
+
+### Closing requests for third-party stubs
+
+We don't keep requests for third-party library stubs open. Close those
+requests as "not planned" with an explanation like this:
+
+    We gladly accept type stub contributions for third-party libraries that are published on PyPI in typeshed. To contribute a new library, please follow the steps outlined in [CONTRIBUTING.md](/python/typeshed/blob/main/CONTRIBUTING.md). The `create_baseline_stubs.py` script can be useful to create an initial version, suitable for inclusion in typeshed.
+
+    That said, we don't keep requests for third-party library stubs open, unless there are issues that need to be addressed before a PR can be opened. Therefore, I'm closing this issue.
diff --git a/stdlib/_zstd.pyi b/stdlib/_zstd.pyi
@@ -46,7 +46,10 @@ class ZstdCompressor:
     FLUSH_BLOCK: Final = 1
     FLUSH_FRAME: Final = 2
     def __new__(
-        cls, level: int | None = None, options: Mapping[int, int] | None = None, zstd_dict: ZstdDict | None = None
+        cls,
+        level: int | None = None,
+        options: Mapping[int, int] | None = None,
+        zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
     ) -> Self: ...
     def compress(
         self, /, data: ReadableBuffer, mode: _ZstdCompressorContinue | _ZstdCompressorFlushBlock | _ZstdCompressorFlushFrame = 0
@@ -58,7 +61,9 @@ class ZstdCompressor:
 
 @final
 class ZstdDecompressor:
-    def __new__(cls, zstd_dict: ZstdDict | None = None, options: Mapping[int, int] | None = None) -> Self: ...
+    def __new__(
+        cls, zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, options: Mapping[int, int] | None = None
+    ) -> Self: ...
     def decompress(self, /, data: ReadableBuffer, max_length: int = -1) -> bytes: ...
     @property
     def eof(self) -> bool: ...
diff --git a/stdlib/argparse.pyi b/stdlib/argparse.pyi
@@ -249,7 +249,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
     def _read_args_from_files(self, arg_strings: list[str]) -> list[str]: ...
     def _match_argument(self, action: Action, arg_strings_pattern: str) -> int: ...
     def _match_arguments_partial(self, actions: Sequence[Action], arg_strings_pattern: str) -> list[int]: ...
-    def _parse_optional(self, arg_string: str) -> tuple[Action | None, str, str | None] | None: ...
+    if sys.version_info >= (3, 12):
+        def _parse_optional(self, arg_string: str) -> list[tuple[Action | None, str, str | None, str | None]] | None: ...
+    else:
+        def _parse_optional(self, arg_string: str) -> tuple[Action | None, str, str | None] | None: ...
+
     def _get_option_tuples(self, option_string: str) -> list[tuple[Action, str, str | None]]: ...
     def _get_nargs_pattern(self, action: Action) -> str: ...
     def _get_values(self, action: Action, arg_strings: list[str]) -> Any: ...
diff --git a/stdlib/compression/zstd/__init__.pyi b/stdlib/compression/zstd/__init__.pyi
@@ -44,9 +44,14 @@ def get_frame_info(frame_buffer: ReadableBuffer) -> FrameInfo: ...
 def train_dict(samples: Iterable[ReadableBuffer], dict_size: int) -> ZstdDict: ...
 def finalize_dict(zstd_dict: ZstdDict, /, samples: Iterable[ReadableBuffer], dict_size: int, level: int) -> ZstdDict: ...
 def compress(
-    data: ReadableBuffer, level: int | None = None, options: Mapping[int, int] | None = None, zstd_dict: ZstdDict | None = None
+    data: ReadableBuffer,
+    level: int | None = None,
+    options: Mapping[int, int] | None = None,
+    zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
+) -> bytes: ...
+def decompress(
+    data: ReadableBuffer, zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, options: Mapping[int, int] | None = None
 ) -> bytes: ...
-def decompress(data: ReadableBuffer, zstd_dict: ZstdDict | None = None, options: Mapping[int, int] | None = None) -> bytes: ...
 @final
 class CompressionParameter(enum.IntEnum):
     compression_level = _zstd.ZSTD_c_compressionLevel
diff --git a/stdlib/compression/zstd/_zstdfile.pyi b/stdlib/compression/zstd/_zstdfile.pyi
@@ -36,7 +36,7 @@ class ZstdFile(_streams.BaseStream):
         *,
         level: None = None,
         options: Mapping[int, int] | None = None,
-        zstd_dict: ZstdDict | None = None,
+        zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
     ) -> None: ...
     @overload
     def __init__(
@@ -47,7 +47,7 @@ class ZstdFile(_streams.BaseStream):
         *,
         level: int | None = None,
         options: Mapping[int, int] | None = None,
-        zstd_dict: ZstdDict | None = None,
+        zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
     ) -> None: ...
     def write(self, data: ReadableBuffer, /) -> int: ...
     def flush(self, mode: _ZstdCompressorFlushBlock | _ZstdCompressorFlushFrame = 1) -> bytes: ...  # type: ignore[override]
@@ -71,7 +71,7 @@ def open(
     *,
     level: None = None,
     options: Mapping[int, int] | None = None,
-    zstd_dict: ZstdDict | None = None,
+    zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
     encoding: str | None = None,
     errors: str | None = None,
     newline: str | None = None,
@@ -84,7 +84,7 @@ def open(
     *,
     level: int | None = None,
     options: Mapping[int, int] | None = None,
-    zstd_dict: ZstdDict | None = None,
+    zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
     encoding: str | None = None,
     errors: str | None = None,
     newline: str | None = None,
@@ -97,7 +97,7 @@ def open(
     *,
     level: None = None,
     options: Mapping[int, int] | None = None,
-    zstd_dict: ZstdDict | None = None,
+    zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
     encoding: str | None = None,
     errors: str | None = None,
     newline: str | None = None,
@@ -110,7 +110,7 @@ def open(
     *,
     level: int | None = None,
     options: Mapping[int, int] | None = None,
-    zstd_dict: ZstdDict | None = None,
+    zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
     encoding: str | None = None,
     errors: str | None = None,
     newline: str | None = None,
diff --git a/stdlib/tarfile.pyi b/stdlib/tarfile.pyi
@@ -214,7 +214,7 @@ class TarFile:
             errorlevel: int | None = ...,
             level: None = None,
             options: Mapping[int, int] | None = None,
-            zstd_dict: ZstdDict | None = None,
+            zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
         ) -> Self: ...
 
     @overload
@@ -355,7 +355,7 @@ class TarFile:
             debug: int | None = ...,
             errorlevel: int | None = ...,
             options: Mapping[int, int] | None = None,
-            zstd_dict: ZstdDict | None = None,
+            zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
         ) -> Self: ...
         @overload
         @classmethod
@@ -376,7 +376,7 @@ class TarFile:
             debug: int | None = ...,
             errorlevel: int | None = ...,
             options: Mapping[int, int] | None = None,
-            zstd_dict: ZstdDict | None = None,
+            zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
         ) -> Self: ...
 
     @overload
@@ -611,7 +611,7 @@ class TarFile:
             fileobj: IO[bytes] | None = None,
             level: None = None,
             options: Mapping[int, int] | None = None,
-            zstd_dict: ZstdDict | None = None,
+            zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
             *,
             format: int | None = ...,
             tarinfo: type[TarInfo] | None = ...,
@@ -631,7 +631,7 @@ class TarFile:
             fileobj: IO[bytes] | None = None,
             level: int | None = None,
             options: Mapping[int, int] | None = None,
-            zstd_dict: ZstdDict | None = None,
+            zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None,
             *,
             format: int | None = ...,
             tarinfo: type[TarInfo] | None = ...,
diff --git a/stubs/networkx/METADATA.toml b/stubs/networkx/METADATA.toml
@@ -1,4 +1,4 @@
-version = "3.6"
+version = "3.6.1"
 upstream_repository = "https://github.com/networkx/networkx"
 # requires a version of numpy with a `py.typed` file
 requires = ["numpy>=1.20"]
diff --git a/stubs/networkx/networkx/algorithms/bipartite/matrix.pyi b/stubs/networkx/networkx/algorithms/bipartite/matrix.pyi
@@ -16,4 +16,11 @@ def biadjacency_matrix(
     format="csr",
 ): ...  # Return is a complex union of scipy classes depending on the format param
 @_dispatchable
-def from_biadjacency_matrix(A, create_using: Graph[_Node] | None = None, edge_attribute: str = "weight"): ...
+def from_biadjacency_matrix(
+    A,
+    create_using: Graph[_Node] | None = None,
+    edge_attribute: str = "weight",
+    *,
+    row_order: Iterable[Incomplete] | None = None,
+    column_order: Iterable[Incomplete] | None = None,
+): ...
diff --git a/stubs/networkx/networkx/algorithms/community/__init__.pyi b/stubs/networkx/networkx/algorithms/community/__init__.pyi
@@ -1,9 +1,9 @@
 from networkx.algorithms.community.asyn_fluid import *
+from networkx.algorithms.community.bipartitions import *
 from networkx.algorithms.community.centrality import *
 from networkx.algorithms.community.community_utils import *
 from networkx.algorithms.community.divisive import *
 from networkx.algorithms.community.kclique import *
-from networkx.algorithms.community.kernighan_lin import *
 from networkx.algorithms.community.label_propagation import *
 from networkx.algorithms.community.leiden import *
 from networkx.algorithms.community.local import *
diff --git a/stubs/networkx/networkx/algorithms/community/bipartitions.pyi b/stubs/networkx/networkx/algorithms/community/bipartitions.pyi
@@ -0,0 +1,22 @@
+from _typeshed import Incomplete
+from collections.abc import Iterable
+
+from networkx.algorithms.shortest_paths.weighted import _WeightFunc
+from networkx.classes.graph import Graph, _Node
+from networkx.utils.backends import _dispatchable
+from numpy.random import RandomState
+
+__all__ = ["kernighan_lin_bisection", "spectral_modularity_bipartition", "greedy_node_swap_bipartition"]
+
+@_dispatchable
+def kernighan_lin_bisection(
+    G: Graph[_Node],
+    partition: tuple[Iterable[Incomplete], Iterable[Incomplete]] | None = None,
+    max_iter: int = 10,
+    weight: str | _WeightFunc[_Node] = "weight",
+    seed: int | RandomState | None = None,
+) -> tuple[set[Incomplete], set[Incomplete]]: ...
+def spectral_modularity_bipartition(G: Graph[_Node]) -> tuple[set[Incomplete], set[Incomplete]]: ...
+def greedy_node_swap_bipartition(
+    G: Graph[_Node], *, init_split: tuple[set[Incomplete], set[Incomplete]] | None = None, max_iter: int = 10
+) -> tuple[set[Incomplete], set[Incomplete]]: ...
diff --git a/stubs/networkx/networkx/algorithms/community/kernighan_lin.pyi b/stubs/networkx/networkx/algorithms/community/kernighan_lin.pyi
diff --git a/stubs/networkx/networkx/classes/graph.pyi b/stubs/networkx/networkx/classes/graph.pyi
@@ -43,7 +43,7 @@ class Graph(Collection[_Node]):
     def to_undirected_class(self) -> type[Graph[_Node]]: ...
     # @_dispatchable adds `backend` argument, but this decorated is unsupported constructor type here
     # and __init__() ignores this argument
-    def __new__(cls, incoming_graph_data: _Data[_Node] | None = None, *, backend=None, **attr: Any) -> Self: ...
+    def __new__(cls, *args, backend=None, **kwargs) -> Self: ...
     def __init__(self, incoming_graph_data: _Data[_Node] | None = None, **attr: Any) -> None: ...  # attr: key=value pairs
     @cached_property
     def adj(self) -> AdjacencyView[_Node, _Node, dict[str, Any]]: ...
diff --git a/stubs/networkx/networkx/classes/multigraph.pyi b/stubs/networkx/networkx/classes/multigraph.pyi
@@ -24,7 +24,7 @@ class MultiGraph(Graph[_Node]):
     def to_undirected_class(self) -> type[MultiGraph[_Node]]: ...
     # @_dispatchable adds `backend` argument, but this decorated is unsupported constructor type here
     # and __init__() ignores this argument
-    def __new__(cls, incoming_graph_data=None, multigraph_input: bool | None = None, *, backend=None, **attr: Any) -> Self: ...
+    def __new__(cls, *args, backend=None, **kwargs) -> Self: ...
     def __init__(self, incoming_graph_data=None, multigraph_input: bool | None = None, **attr: Any) -> None: ...
     @cached_property
     def adj(self) -> MultiAdjacencyView[_Node, _Node, dict[str, Any]]: ...  # data can be any type
diff --git a/stubs/protobuf/google/protobuf/internal/containers.pyi b/stubs/protobuf/google/protobuf/internal/containers.pyi
@@ -1,4 +1,4 @@
-from collections.abc import Callable, Iterable, Iterator, MutableMapping, Sequence
+from collections.abc import Callable, Iterable, Iterator, MutableMapping, MutableSequence, Sequence
 from typing import Any, Protocol, SupportsIndex, TypeVar, overload, type_check_only
 from typing_extensions import Self
 
@@ -25,12 +25,13 @@ class BaseContainer(Sequence[_T]):
     def __hash__(self) -> int: ...
     # Same as list.sort, the extra sort_function kwarg errors in Python 3
     def sort(self, *, key: Callable[[_T], Any] | None = None, reverse: bool = False) -> None: ...
+    def reverse(self) -> None: ...
     @overload
     def __getitem__(self, key: SupportsIndex) -> _T: ...
     @overload
     def __getitem__(self, key: slice) -> list[_T]: ...
 
-class RepeatedScalarFieldContainer(BaseContainer[_ScalarV]):
+class RepeatedScalarFieldContainer(BaseContainer[_ScalarV], MutableSequence[_ScalarV]):
     __slots__ = ["_type_checker"]
     def __init__(self, message_listener: MessageListener, type_checker: _ValueChecker[_ScalarV]) -> None: ...
     def append(self, value: _ScalarV) -> None: ...
@@ -46,7 +47,7 @@ class RepeatedScalarFieldContainer(BaseContainer[_ScalarV]):
     def __delitem__(self, key: int | slice) -> None: ...
     def __eq__(self, other: object) -> bool: ...
 
-class RepeatedCompositeFieldContainer(BaseContainer[_MessageV]):
+class RepeatedCompositeFieldContainer(BaseContainer[_MessageV], MutableSequence[_MessageV]):
     __slots__ = ["_message_descriptor"]
     def __init__(self, message_listener: MessageListener, message_descriptor: Descriptor) -> None: ...
     def add(self, **kwargs: Any) -> _MessageV: ...
@@ -56,6 +57,10 @@ class RepeatedCompositeFieldContainer(BaseContainer[_MessageV]):
     def MergeFrom(self, other: Self | Iterable[_MessageV]) -> None: ...
     def remove(self, elem: _MessageV) -> None: ...
     def pop(self, key: int = -1) -> _MessageV: ...
+    @overload
+    def __setitem__(self, key: int, value: _MessageV) -> None: ...
+    @overload
+    def __setitem__(self, key: slice, value: Iterable[_MessageV]) -> None: ...
     def __delitem__(self, key: int | slice) -> None: ...
     def __eq__(self, other: object) -> bool: ...
 
diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi
@@ -198,7 +198,10 @@ class Process:
     if sys.platform != "darwin":
         def io_counters(self) -> pio: ...
         def ionice(self, ioclass: int | None = None, value: int | None = None) -> pionice: ...
-        def cpu_affinity(self, cpus: list[int] | None = None) -> list[int] | None: ...
+        @overload
+        def cpu_affinity(self, cpus: None = None) -> list[int]: ...
+        @overload
+        def cpu_affinity(self, cpus: list[int]) -> None: ...
         def memory_maps(self, grouped: bool = True) -> list[Incomplete]: ...
     if sys.platform == "linux":
         def rlimit(self, resource: int, limits: tuple[int, int] | None = ...) -> tuple[int, int]: ...
diff --git a/stubs/yt-dlp/@tests/stubtest_allowlist.txt b/stubs/yt-dlp/@tests/stubtest_allowlist.txt
@@ -26,5 +26,3 @@ yt_dlp.utils.(_utils.)?prepend_extension
 yt_dlp.utils.(_utils.)?replace_extension
 # Unsure why this is here.
 yt_dlp.utils.jslib.devalue.TYPE_CHECKING
-# internal API:
-yt_dlp.utils._jsruntime.runtime_version_tuple
diff --git a/stubs/yt-dlp/METADATA.toml b/stubs/yt-dlp/METADATA.toml
@@ -1,3 +1,3 @@
-version = "2025.11.12"
+version = "2025.12.08"
 upstream_repository = "https://github.com/yt-dlp/yt-dlp"
 requires = ["websockets"]
diff --git a/stubs/yt-dlp/yt_dlp/extractor/common.pyi b/stubs/yt-dlp/yt_dlp/extractor/common.pyi
@@ -32,6 +32,7 @@ class _InfoDict(TypedDict, total=False):
     title: str | None
     uploader: str | None
     url: str | None
+    requested_formats: Iterable[_InfoDict]
 
 _StrNoDefaultOrNone: TypeAlias = str | None | type[NO_DEFAULT]
 _T = TypeVar("_T")
diff --git a/stubs/yt-dlp/yt_dlp/utils/_utils.pyi b/stubs/yt-dlp/yt_dlp/utils/_utils.pyi
@@ -467,7 +467,7 @@ STR_FORMAT_RE_TMPL: Final[str]
 STR_FORMAT_TYPES: Final[str]
 
 def limit_length(s: str, length: int) -> str: ...
-def version_tuple(v: str) -> tuple[int, ...]: ...
+def version_tuple(v: str, *, lenient: bool = False) -> tuple[int, ...]: ...
 def is_outdated_version(version: str, limit: str, assume_new: bool = True) -> bool: ...
 def ytdl_is_updateable() -> bool: ...
 def args_to_str(args: str | Collection[str]) -> str: ...

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.6"`
	`1`	`+version = "3.6.1"`
`2`	`2`	`upstream_repository = "https://github.com/networkx/networkx"`
`3`	`3`	# requires a version of numpy with a `py.typed` file
`4`	`4`	`requires = ["numpy>=1.20"]`