Merge branch 'main' into modernize-cookies

Author: srittau

stdlib/cmath.pyi

@@ -9,6 +9,7 @@ nan: Final[float]
 nanj: Final[complex]
 tau: Final[float]
 
+_F: TypeAlias = SupportsFloat | SupportsIndex
 _C: TypeAlias = SupportsFloat | SupportsComplex | SupportsIndex | complex
 
 def acos(z: _C, /) -> complex: ...
@@ -27,7 +28,7 @@ def log(z: _C, base: _C = ..., /) -> complex: ...
 def log10(z: _C, /) -> complex: ...
 def phase(z: _C, /) -> float: ...
 def polar(z: _C, /) -> tuple[float, float]: ...
-def rect(r: float, phi: float, /) -> complex: ...
+def rect(r: _F, phi: _F, /) -> complex: ...
 def sin(z: _C, /) -> complex: ...
 def sinh(z: _C, /) -> complex: ...
 def sqrt(z: _C, /) -> complex: ...

stdlib/http/cookies.pyi

@@ -1,4 +1,4 @@
-from _typeshed import SupportsItems, SupportsKeysAndGetItem
+from _typeshed import MaybeNone, SupportsItems, SupportsKeysAndGetItem
 from collections.abc import Container, Iterable
 from types import GenericAlias
 from typing import Any, Generic, TypeVar, overload
@@ -20,11 +20,11 @@ class CookieError(Exception): ...
 
 class Morsel(dict[str, Any], Generic[_T]):
     @property
-    def value(self) -> str: ...
+    def value(self) -> str | MaybeNone: ...
     @property
-    def coded_value(self) -> _T: ...
+    def coded_value(self) -> _T | MaybeNone: ...
     @property
-    def key(self) -> str: ...
+    def key(self) -> str | MaybeNone: ...
     def __init__(self) -> None: ...
     def set(self, key: str, val: str, coded_val: _T) -> None: ...
     def setdefault(self, key: str, val: str | None = None) -> str: ...

stubs/django-import-export/METADATA.toml

@@ -1,4 +1,4 @@
-version = "4.3.*"
+version = "4.4.*"
 upstream_repository = "https://github.com/django-import-export/django-import-export"
 requires = ["django-stubs"]  # Add tablib when typed, and update _Incomplete aliases in stubs
 

stubs/django-import-export/import_export/widgets.pyi

@@ -65,8 +65,19 @@ class ForeignKeyWidget(Widget, Generic[_ModelT]):
         self, model: _ModelT, field: str = "pk", use_natural_foreign_keys: bool = False, key_is_id: bool = False, **kwargs: Any
     ) -> None: ...
     def get_queryset(self, value: Any, row: Mapping[str, Any], *args: Any, **kwargs: Any) -> QuerySet[_ModelT]: ...
+    def get_instance_by_natural_key(self, value: str | bytes | bytearray) -> _ModelT: ...
+    def get_instance_by_lookup_fields(self, value: Any, row: Mapping[str, Any], **kwargs: Any) -> _ModelT: ...
     def get_lookup_kwargs(self, value: Any, row: Mapping[str, Any] | None = None, **kwargs: Any) -> dict[str, Any]: ...
 
+class _CachedQuerySetWrapper(Generic[_ModelT]):
+    queryset: QuerySet[_ModelT]
+    model: type[_ModelT]
+    def __init__(self, queryset: QuerySet[_ModelT]) -> None: ...
+    def get(self, **lookup_fields: Any) -> _ModelT: ...  # instance can have different fields
+
+class CachedForeignKeyWidget(ForeignKeyWidget[_ModelT]):
+    def get_instance_by_lookup_fields(self, value: Any, row: Mapping[str, Any], **kwargs: Any) -> _ModelT: ...
+
 class ManyToManyWidget(Widget, Generic[_ModelT]):
     model: _ModelT
     separator: str

stubs/tensorflow/tensorflow/__init__.pyi

@@ -18,6 +18,7 @@ from tensorflow import (
     io as io,
     keras as keras,
     math as math,
+    nn as nn,
     random as random,
     types as types,
 )
@@ -37,7 +38,7 @@ from tensorflow.core.protobuf import struct_pb2
 from tensorflow.dtypes import *
 from tensorflow.experimental.dtensor import Layout
 from tensorflow.keras import losses as losses
-from tensorflow.linalg import eye as eye
+from tensorflow.linalg import eye as eye, matmul as matmul
 
 # Most tf.math functions are exported as tf, but sadly not all are.
 from tensorflow.math import (
@@ -385,6 +386,13 @@ def squeeze(
 ) -> Tensor: ...
 @overload
 def squeeze(input: RaggedTensor, axis: int | tuple[int, ...] | list[int], name: str | None = None) -> RaggedTensor: ...
+def split(
+    value: TensorCompatible,
+    num_or_size_splits: int | TensorCompatible,
+    axis: int | Tensor = 0,
+    num: int | None = None,
+    name: str | None = "split",
+) -> list[Tensor]: ...
 def tensor_scatter_nd_update(
     tensor: TensorCompatible, indices: TensorCompatible, updates: TensorCompatible, name: str | None = None
 ) -> Tensor: ...
@@ -434,4 +442,10 @@ def gather_nd(
     name: str | None = None,
     bad_indices_policy: Literal["", "DEFAULT", "ERROR", "IGNORE"] = "",
 ) -> Tensor: ...
+def transpose(
+    a: Tensor, perm: Sequence[int] | IntArray | None = None, conjugate: _bool = False, name: str = "transpose"
+) -> Tensor: ...
+def clip_by_value(
+    t: Tensor | IndexedSlices, clip_value_min: TensorCompatible, clip_value_max: TensorCompatible, name: str | None = None
+) -> Tensor: ...
 def __getattr__(name: str): ...  # incomplete module

stubs/tensorflow/tensorflow/keras/metrics.pyi

@@ -1,6 +1,8 @@
+from _typeshed import Incomplete
 from abc import ABCMeta, abstractmethod
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, Literal
+from enum import Enum
+from typing import Any, Literal, type_check_only
 from typing_extensions import Self, TypeAlias
 
 import tensorflow as tf
@@ -107,6 +109,25 @@ class SparseTopKCategoricalAccuracy(MeanMetricWrapper):
         self, k: int = 5, name: str | None = "sparse_top_k_categorical_accuracy", dtype: DTypeLike | None = None
     ) -> None: ...
 
+# TODO: Actually tensorflow.python.keras.utils.metrics_utils.Reduction, but that module
+# is currently missing from the stub.
+@type_check_only
+class _Reduction(Enum):
+    SUM = "sum"
+    SUM_OVER_BATCH_SIZE = "sum_over_batch_size"
+    WEIGHTED_MEAN = "weighted_mean"
+
+class Reduce(Metric):
+    reduction: _Reduction
+    total: Incomplete
+    count: Incomplete  # only defined for some reductions
+    def __init__(self, reduction: _Reduction, name: str | None, dtype: DTypeLike | None = None) -> None: ...
+    def update_state(self, values, sample_weight=None): ...  # type: ignore[override]
+    def result(self) -> Tensor: ...
+
+class Mean(Reduce):
+    def __init__(self, name: str | None = "mean", dtype: DTypeLike | None = None) -> None: ...
+
 def serialize(metric: KerasSerializable) -> dict[str, Any]: ...
 def binary_crossentropy(
     y_true: TensorCompatible, y_pred: TensorCompatible, from_logits: bool = False, label_smoothing: float = 0.0, axis: int = -1

stubs/xmltodict/@tests/test_cases/check_namespaces.py

@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+import xmltodict
+
+ns: dict[str, None] = {"http://example.com/": None}
+xmltodict.parse("<a/>", namespaces=ns)

stubs/xmltodict/xmltodict.pyi

@@ -25,7 +25,7 @@ class _DictSAXHandler:
     dict_constructor: type
     strip_whitespace: bool
     namespace_separator: str
-    namespaces: dict[str, str] | None
+    namespaces: Mapping[str, str | None] | None
     namespace_declarations: dict[str, str]
     force_list: bool | Container[str] | Callable[[tuple[str, _AttrDict | None], str, str], bool] | None
     comment_key: str
@@ -42,7 +42,7 @@ class _DictSAXHandler:
         dict_constructor: type = ...,
         strip_whitespace: bool = True,
         namespace_separator: str = ":",
-        namespaces: dict[str, str] | None = None,
+        namespaces: Mapping[str, str | None] | None = None,
         force_list: bool | Container[str] | Callable[[tuple[str, _AttrDict | None], str, str], bool] | None = None,
         comment_key: str = "#comment",
     ) -> None: ...
@@ -72,7 +72,7 @@ def parse(
     postprocessor: Callable[[list[tuple[str, _AttrDict | None]], str, _AttrValue], tuple[str, _AttrValue]] | None = None,
     dict_constructor: type = ...,
     strip_whitespace: bool = True,
-    namespaces: dict[str, str] | None = None,
+    namespaces: Mapping[str, str | None] | None = None,
     force_list: bool | Container[str] | Callable[[tuple[str, _AttrDict | None], str, str], bool] | None = None,
     comment_key: str = "#comment",
 ) -> dict[str, Any]: ...
@@ -95,7 +95,7 @@ def unparse(
     newl: str = "\n",
     indent: str | int = "\t",
     namespace_separator: str = ":",
-    namespaces: Mapping[str, str] | None = None,
+    namespaces: Mapping[str, str | None] | None = None,
     expand_iter: str | None = None,
 ) -> None: ...
 @overload
@@ -117,6 +117,6 @@ def unparse(
     newl: str = "\n",
     indent: str | int = "\t",
     namespace_separator: str = ":",
-    namespaces: Mapping[str, str] | None = None,
+    namespaces: Mapping[str, str | None] | None = None,
     expand_iter: str | None = None,
 ) -> str: ...