Fix all mypy attr-defined (#376)

Author: Avasam

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
@@ -160,5 +160,4 @@ disable_error_code = [
     "override", # 790 errors in 220 files
     "assignment", # 773 errors in 172 files
     "misc", # 692 errors in 132 files
-    "attr-defined", # 202 errors in 75 files
 ]

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/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,
+)

stubs/sympy-stubs/algebras/quaternion.pyi

@@ -1,12 +1,17 @@
-from types import NotImplementedType
+import sys
 from typing import Any, Literal
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
 
 from sympy.core.expr import Expr
 from sympy.core.function import UndefinedFunction
 from sympy.core.power import Pow
 from sympy.matrices.dense import MutableDenseMatrix
 
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
+
 class Quaternion(Expr):
     _op_priority = ...
     is_commutative = ...

stubs/sympy-stubs/assumptions/sathandlers.pyi

@@ -18,7 +18,7 @@ class ClassFactRegistry:
     def __getitem__(self, key) -> tuple[frozenset[Any], frozenset[Any]]: ...
     def __call__(self, expr) -> set[Any]: ...
 
-class_fact_registry = ...
+class_fact_registry: ClassFactRegistry
 x = ...
 
 @class_fact_registry.multiregister(Abs)

stubs/sympy-stubs/calculus/accumulationbounds.pyi

@@ -1,5 +1,6 @@
-from types import NotImplementedType
-from typing_extensions import Self
+import sys
+from typing import Any
+from typing_extensions import Self, TypeAlias
 
 from sympy.core.basic import Basic
 from sympy.core.expr import Expr
@@ -8,6 +9,11 @@ from sympy.core.numbers import _sympifyit
 from sympy.core.power import Pow
 from sympy.series.order import Order
 
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
+
 class AccumulationBounds(Expr):
     is_extended_real = ...
     is_number = ...

stubs/sympy-stubs/combinatorics/free_groups.pyi

@@ -1,12 +1,17 @@
-from types import NotImplementedType
+import sys
 from typing import Any, Literal
-from typing_extensions import Self, Unpack
+from typing_extensions import Self, TypeAlias, Unpack
 
 from sympy.core.expr import Expr
 from sympy.core.sympify import CantSympify
 from sympy.printing.defaults import DefaultPrinting
 from sympy.utilities import public
 
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
+
 @public
 def free_group(symbols) -> tuple[FreeGroup, Unpack[tuple[Any, ...]]]: ...
 @public

stubs/sympy-stubs/core/containers.pyi

@@ -1,11 +1,16 @@
-from collections.abc import Generator, Iterator, MutableSet
-from types import NotImplementedType
+import sys
+from collections.abc import Iterator, MutableSet
 from typing import Any, Callable
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
 
 from sympy.core.basic import Basic
 from sympy.core.kind import Kind
 
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
+
 class Tuple(Basic):
     def __new__(cls, *args, **kwargs) -> Self: ...
     def __getitem__(self, i) -> Tuple: ...

stubs/sympy-stubs/core/expr.pyi

@@ -3,7 +3,7 @@ from typing import Any, Literal
 from typing_extensions import Self
 
 from sympy import Derivative, Equality, Integer, Mul, Order, Pow
-from sympy.core.basic import Atom, Basic
+from sympy.core.basic import Atom as Atom, Basic
 from sympy.core.cache import cacheit
 from sympy.core.decorators import call_highest_priority, sympify_method_args, sympify_return
 from sympy.core.evalf import EvalfMixin

stubs/sympy-stubs/core/exprtools.pyi

@@ -1,6 +1,6 @@
-from types import NotImplementedType
+import sys
 from typing import Any
-from typing_extensions import LiteralString
+from typing_extensions import LiteralString, TypeAlias
 
 from sympy import Order
 from sympy.core.add import Add
@@ -9,6 +9,11 @@ from sympy.core.expr import Expr
 from sympy.core.mul import Mul
 from sympy.core.numbers import Rational
 
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
+
 _eps = ...
 
 def decompose_power(expr: Expr) -> tuple[Expr, int]: ...

stubs/sympy-stubs/core/function.pyi

@@ -1,7 +1,7 @@
+import sys
 from inspect import Signature
-from types import NotImplementedType
 from typing import Any, Callable, Literal
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
 
 from sympy.core.basic import Basic
 from sympy.core.cache import cacheit
@@ -10,10 +10,14 @@ from sympy.core.expr import AtomicExpr, Expr
 from sympy.core.kind import Kind
 from sympy.core.logic import FuzzyBool
 from sympy.core.numbers import Float
-from sympy.printing.str import StrPrinter
 from sympy.sets.sets import FiniteSet
 from sympy.tensor.array.array_derivatives import ArrayDerivative
 
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
+
 class PoleError(Exception): ...
 class ArgumentIndexError(ValueError): ...
 class BadSignatureError(TypeError): ...

stubs/sympy-stubs/core/numbers.pyi

@@ -1,16 +1,21 @@
+import sys
 from functools import lru_cache
-from types import NotImplementedType
 from typing import Any, Literal
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
 
 from sympy.core.basic import Basic
 from sympy.core.cache import cacheit
-from sympy.core.decorators import _sympifyit
+from sympy.core.decorators import _sympifyit as _sympifyit
 from sympy.core.expr import AtomicExpr, Expr
 from sympy.core.mul import Mul
 from sympy.core.singleton import Singleton
 from sympy.series.order import Order
 
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
+
 _LOG2 = ...
 
 def comp(z1, z2, tol=...) -> bool: ...

stubs/sympy-stubs/core/relational.pyi

@@ -1,10 +1,15 @@
-from types import NotImplementedType
+import sys
 from typing import Any
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
 
 from sympy.core.basic import Basic
 from sympy.core.evalf import EvalfMixin
-from sympy.logic.boolalg import Boolean
+from sympy.logic.boolalg import Boolean as Boolean
+
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
 
 __all__ = (
     "Rel",

stubs/sympy-stubs/external/pythonmpq.pyi

@@ -1,6 +1,11 @@
-from types import NotImplementedType
+import sys
 from typing import Any
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
+
+if sys.version_info >= (3, 10):
+    from types import NotImplementedType
+else:
+    NotImplementedType: TypeAlias = Any
 
 _PyHASH_MODULUS = ...
 _PyHASH_INF = ...