Merge branch 'main' into Explain-why-mypy-overrides-is-ignored

Author: debonte

pyproject.toml

@@ -11,7 +11,7 @@ hygiene = ["ruff ==0.11.*"]
 tests = [
     # Tools used for testing
     "docopt-ng",
-    "mypy ==1.13.*",
+    "mypy ==1.15.*",
     "pyright",
 
     # Typed libraries and stubs
@@ -159,8 +159,6 @@ disable_error_code = [
     # as they are inherited from the implementation.
     "override",
     # TODO
-    "valid-type", # 967 errors in 115 files
     "assignment", # 773 errors in 172 files
     "misc", # 692 errors in 132 files
-    "attr-defined", # 202 errors in 75 files
 ]

stubs/matplotlib/_typing.pyi

@@ -1,14 +1,12 @@
-import decimal
 import io
 import typing_extensions
+from decimal import Decimal as Decimal
 
-import numpy.typing
 import pandas as pd
+from numpy.typing import ArrayLike as ArrayLike
 
-Decimal = decimal.Decimal
 PythonScalar: typing_extensions.TypeAlias = str | int | float | bool
 
-ArrayLike = numpy.typing.ArrayLike
 FileLike = io.IOBase
 PathLike = str
 

stubs/matplotlib/backend_bases.pyi

@@ -310,7 +310,7 @@ class FigureCanvasBase:
     def mpl_connect(self, s: str, func: Callable) -> int: ...
     def mpl_disconnect(self, cid: int): ...
     _timer_cls = TimerBase
-    def new_timer(self, interval: int = ..., callbacks: list[tuple[Callable, tuple, dict]] = ...) -> _timer_cls: ...
+    def new_timer(self, interval: int = ..., callbacks: list[tuple[Callable, tuple, dict]] = ...) -> TimerBase: ...
     def flush_events(self) -> None: ...
     def start_event_loop(self, timeout: int = ...) -> None: ...
     def stop_event_loop(self) -> None: ...

stubs/matplotlib/backend_tools.pyi

@@ -32,8 +32,7 @@ class ToolBase:
     def figure(self) -> Figure: ...
     @figure.setter
     def figure(self, figure: Figure) -> None: ...
-
-    set_figure = figure.fset
+    def set_figure(self, figure: Figure) -> None: ...
     def trigger(self, sender: object, event: Event, data: object = ...) -> None: ...
     def destroy(self) -> None: ...
 

stubs/matplotlib/backends/qt_compat.pyi

@@ -1,4 +1,5 @@
-from typing import Any, TypeAlias
+from typing import Any
+from typing_extensions import TypeAlias
 
 QT_API_PYQT6: str = ...
 QT_API_PYSIDE6: str = ...

stubs/matplotlib/transforms.pyi

@@ -137,23 +137,23 @@ class Bbox(BboxBase):
         updatex: bool = True,
         updatey: bool = True,
     ): ...
-    @BboxBase.x0.setter
+    @BboxBase.x0.setter  # type: ignore[attr-defined] # python/mypy#5936
     def x0(self, val: float): ...
-    @BboxBase.y0.setter
+    @BboxBase.y0.setter  # type: ignore[attr-defined] # python/mypy#5936
     def y0(self, val: float): ...
-    @BboxBase.x1.setter
+    @BboxBase.x1.setter  # type: ignore[attr-defined] # python/mypy#5936
     def x1(self, val: float): ...
-    @BboxBase.y1.setter
+    @BboxBase.y1.setter  # type: ignore[attr-defined] # python/mypy#5936
     def y1(self, val: float): ...
-    @BboxBase.p0.setter
+    @BboxBase.p0.setter  # type: ignore[attr-defined] # python/mypy#5936
     def p0(self, val: float): ...
-    @BboxBase.p1.setter
+    @BboxBase.p1.setter  # type: ignore[attr-defined] # python/mypy#5936
     def p1(self, val: float): ...
-    @BboxBase.intervalx.setter
+    @BboxBase.intervalx.setter  # type: ignore[attr-defined] # python/mypy#5936
     def intervalx(self, interval): ...
-    @BboxBase.intervaly.setter
+    @BboxBase.intervaly.setter  # type: ignore[attr-defined] # python/mypy#5936
     def intervaly(self, interval): ...
-    @BboxBase.bounds.setter
+    @BboxBase.bounds.setter  # type: ignore[attr-defined] # python/mypy#5936
     def bounds(self, bounds): ...
     @property
     def minpos(self) -> float: ...

stubs/sklearn/_typing.pyi

@@ -2,21 +2,19 @@
 # to simplify the stubs generated by docs2stub. They are not
 # intended to be used directly by other users.
 
-import decimal
 import io
 import typing_extensions
+from decimal import Decimal as Decimal
 
 import numpy as np
-import numpy.typing
 import pandas as pd
+from numpy.typing import ArrayLike as ArrayLike
 from scipy.sparse import spmatrix
 
 from .base import BaseEstimator, ClassifierMixin, RegressorMixin
 
-Decimal = decimal.Decimal
 PythonScalar: typing_extensions.TypeAlias = str | int | float | bool
 
-ArrayLike = numpy.typing.ArrayLike
 MatrixLike: typing_extensions.TypeAlias = np.ndarray | pd.DataFrame | spmatrix
 FileLike = io.IOBase
 PathLike = str

stubs/sklearn/linear_model/_base.pyi

@@ -6,13 +6,10 @@ from numpy import ndarray
 from numpy.random.mtrand import RandomState
 
 from .._typing import ArrayLike, Int, MatrixLike
-from ..base import BaseEstimator, ClassifierMixin, MultiOutputMixin, RegressorMixin
+from ..base import BaseEstimator as BaseEstimator, ClassifierMixin, MultiOutputMixin, RegressorMixin
 from ..utils._seq_dataset import ArrayDataset64, CSRDataset64
 from ._stochastic_gradient import SGDClassifier
 
-# TODO: bayesian_ridge_regression and bayesian_regression_ard
-# should be squashed into its respective objects.
-
 SPARSE_INTERCEPT_DECAY: float = ...
 
 def make_dataset(
@@ -27,8 +24,6 @@ class LinearModel(BaseEstimator, metaclass=ABCMeta):
     def fit(self, X, y): ...
     def predict(self, X: MatrixLike) -> ndarray: ...
 
-# XXX Should this derive from LinearModel? It should be a mixin, not an ABC.
-# Maybe the n_features checking can be moved to LinearModel.
 class LinearClassifierMixin(ClassifierMixin):
     def decision_function(self, X: MatrixLike | ArrayLike) -> ndarray: ...
     def predict(self, X: MatrixLike | ArrayLike) -> ndarray: ...

stubs/sklearn/utils/_metadata_requests.pyi

@@ -0,0 +1,86 @@
+from typing import Final, NamedTuple
+
+SIMPLE_METHODS = ...
+COMPOSITE_METHODS = ...
+METHODS = ...
+
+def _routing_enabled(): ...
+def _raise_for_params(params, owner, method) -> None: ...
+def _raise_for_unsupported_routing(obj, method, **kwargs) -> None: ...
+
+class _RoutingNotSupportedMixin:
+    def get_metadata_routing(self) -> None: ...
+
+UNUSED: Final = "$UNUSED$"
+WARN: Final = "$WARN$"
+UNCHANGED: Final = "$UNCHANGED$"
+VALID_REQUEST_VALUES = ...
+
+def request_is_alias(item): ...
+def request_is_valid(item): ...
+
+class MethodMetadataRequest:
+    owner = ...
+    method = ...
+    def __init__(self, owner, method, requests=None) -> None: ...
+    @property
+    def requests(self): ...
+    def add_request(self, *, param, alias): ...
+
+class MetadataRequest:
+    owner = ...
+    def __init__(self, owner) -> None: ...
+    def consumes(self, method, params): ...
+    def __getattr__(self, name): ...
+
+class RouterMappingPair(NamedTuple):
+    mapping = ...
+    router = ...
+
+class MethodPair(NamedTuple):
+    caller = ...
+    callee = ...
+
+class MethodMapping:
+    def __init__(self) -> None: ...
+    def __iter__(self): ...
+    def add(self, *, caller, callee): ...
+
+class MetadataRouter:
+    owner = ...
+    def __init__(self, owner) -> None: ...
+    def add_self_request(self, obj): ...
+    def add(self, *, method_mapping, **objs): ...
+    def consumes(self, method, params): ...
+    def route_params(self, *, caller, params): ...
+    def validate_metadata(self, *, method, params) -> None: ...
+    def __iter__(self): ...
+
+def get_routing_for_object(obj=None): ...
+
+REQUESTER_DOC: Final[str]
+REQUESTER_DOC_PARAM: Final[str]
+REQUESTER_DOC_RETURN: Final[str]
+
+class RequestMethod:
+    name = ...
+    keys = ...
+    validate_keys = ...
+    def __init__(self, name, keys, validate_keys: bool = True) -> None: ...
+    def __get__(self, instance, owner): ...
+
+class _MetadataRequester:
+    def set_fit_request(self, **kwargs): ...
+    def set_partial_fit_request(self, **kwargs): ...
+    def set_predict_request(self, **kwargs): ...
+    def set_predict_proba_request(self, **kwargs): ...
+    def set_predict_log_proba_request(self, **kwargs): ...
+    def set_decision_function_request(self, **kwargs): ...
+    def set_score_request(self, **kwargs): ...
+    def set_split_request(self, **kwargs): ...
+    def set_transform_request(self, **kwargs): ...
+    def set_inverse_transform_request(self, **kwargs): ...
+    def __init_subclass__(cls, **kwargs): ...
+    def get_metadata_routing(self): ...
+
+def process_routing(_obj, _method, /, **kwargs): ...

stubs/sklearn/utils/metadata_routing.pyi

@@ -0,0 +1,15 @@
+from ._metadata_requests import (
+    UNCHANGED as UNCHANGED,
+    UNUSED as UNUSED,
+    WARN as WARN,
+    MetadataRequest as MetadataRequest,
+    MetadataRouter as MetadataRouter,
+    MethodMapping as MethodMapping,
+    _MetadataRequester as _MetadataRequester,
+    _raise_for_params as _raise_for_params,
+    _raise_for_unsupported_routing as _raise_for_unsupported_routing,
+    _routing_enabled as _routing_enabled,
+    _RoutingNotSupportedMixin as _RoutingNotSupportedMixin,
+    get_routing_for_object as get_routing_for_object,
+    process_routing as process_routing,
+)