Update to attrs 25.4

Author: Tinche

pyproject.toml

@@ -40,7 +40,7 @@ authors = [
     {name = "Tin Tvrtkovic", email = "tinchester@gmail.com"},
 ]
 dependencies = [
-    "attrs>=24.3.0",
+    "attrs>=25.4.0",
     "typing-extensions>=4.14.0",
     "exceptiongroup>=1.1.1; python_version < '3.11'",
 ]

src/cattrs/subclasses.py

@@ -11,14 +11,17 @@ def subclasses(cls: type) -> list[type]:
     def subclasses(cls: type) -> list[type]:
         """A helper for getting subclasses of a class.
 
-        Filters out duplicate subclasses of slot dataclasses.
+        Filters out duplicate subclasses of slot dataclasses and attrs classes.
         """
         return [
             cl
             for cl in cls.__subclasses__()
-            if not (
-                "__slots__" not in cl.__dict__
-                and hasattr(cls, "__dataclass_params__")
-                and cls.__dataclass_params__.slots
+            if (
+                not (
+                    "__slots__" not in cl.__dict__
+                    and hasattr(cls, "__dataclass_params__")
+                    and cls.__dataclass_params__.slots
+                )
+                and not hasattr(cls, "__attrs_base_of_slotted__")
             )
         ]

tests/typed.py

@@ -287,7 +287,7 @@ def _create_hyp_class_and_strat(
     attrs_and_strategy: list[tuple[_CountingAttr, SearchStrategy[PosArg]]],
 ) -> SearchStrategy[tuple[type, SearchStrategy[PosArgs], SearchStrategy[KwArgs]]]:
     def key(t):
-        return (t[0].default is not NOTHING, t[0].kw_only)
+        return (t[0].default is not NOTHING, t[0].kw_only or False)
 
     attrs_and_strat = sorted(attrs_and_strategy, key=key)
     attrs = [a[0] for a in attrs_and_strat]

tests/untyped.py

@@ -177,7 +177,7 @@ def _create_hyp_class(
     """
 
     def key(t):
-        return (t[0].default is not NOTHING, t[0].kw_only)
+        return (t[0].default is not NOTHING, t[0].kw_only or False)
 
     attrs_and_strat = sorted(attrs_and_strategy, key=key)
     attrs = [a[0] for a in attrs_and_strat]