Merge branch 'main' into uv-lock

Author: hynek

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.9
+    rev: v0.11.4
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

CHANGELOG.md

@@ -12,6 +12,28 @@ Changes for the upcoming release can be found in the [`changelog.d` directory](h
 
 <!-- towncrier release notes start -->
 
+## [25.3.0](https://github.com/python-attrs/attrs/tree/25.3.0) - 2025-03-13
+
+### Changes
+
+- Restore support for generator-based `field_transformer`s.
+  [#1417](https://github.com/python-attrs/attrs/issues/1417)
+
+
+## [25.2.0](https://github.com/python-attrs/attrs/tree/25.2.0) - 2025-03-12
+
+### Changes
+
+- Checking mandatory vs non-mandatory attribute order is now performed after the field transformer, since the field transformer may change attributes and/or their order.
+  [#1147](https://github.com/python-attrs/attrs/issues/1147)
+- `attrs.make_class()` now allows for Unicode class names.
+  [#1406](https://github.com/python-attrs/attrs/issues/1406)
+- Speed up class creation by 30%-50% by compiling methods only once and using a variety of other techniques.
+  [#1407](https://github.com/python-attrs/attrs/issues/1407)
+- The error message if an attribute has both an annotation and a type argument will now disclose _what_ attribute seems to be the problem.
+  [#1410](https://github.com/python-attrs/attrs/issues/1410)
+
+
 ## [25.1.0](https://github.com/python-attrs/attrs/tree/25.1.0) - 2025-01-25
 
 ### Changes

changelog.d/1147.change.md

@@ -34,6 +34,10 @@
     "https://github.com/python-attrs/attrs/tree/.*",
 ]
 
+linkcheck_anchors_ignore_for_url = [
+    r"^https?://(www\.)?github\.com/.*",
+]
+
 # In nitpick mode (-n), still ignore any of the following "broken" references
 # to non-types.
 nitpick_ignore = [

changelog.d/1406.change.md

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: MITpyp
+# SPDX-License-Identifier: MIT
 
 [build-system]
 requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme>=23.2.0"]

changelog.d/1407.change.md

@@ -448,7 +448,7 @@ def _transform_attrs(
     attrs = base_attrs + own_attrs
 
     if field_transformer is not None:
-        attrs = field_transformer(cls, attrs)
+        attrs = tuple(field_transformer(cls, attrs))
 
     # Check attr order after executing the field_transformer.
     # Mandatory vs non-mandatory attr order only matters when they are part of
@@ -2491,7 +2491,7 @@ def from_counting_attr(cls, name: str, ca: _CountingAttr, type=None):
         if type is None:
             type = ca.type
         elif ca.type is not None:
-            msg = "Type annotation and type argument cannot both be present"
+            msg = f"Type annotation and type argument cannot both be present for '{name}'."
             raise ValueError(msg)
         return cls(
             name,

docs/conf.py

@@ -62,7 +62,7 @@ class C:
                 x: int = attr.ib(type=int)
 
         assert (
-            "Type annotation and type argument cannot both be present",
+            "Type annotation and type argument cannot both be present for 'x'.",
         ) == e.value.args
 
     def test_typing_annotations(self):

pyproject.toml

@@ -217,6 +217,22 @@ class C:
         assert "CAttributes" == fields_type.__name__
         assert issubclass(fields_type, tuple)
 
+    def test_hook_generator(self):
+        """
+        field_transfromers can be a generators.
+
+        Regression test for #1416.
+        """
+
+        def hook(cls, attribs):
+            yield from attribs
+
+        @attr.s(auto_attribs=True, field_transformer=hook)
+        class Base:
+            x: int
+
+        assert ["x"] == [a.name for a in attr.fields(Base)]
+
 
 class TestAsDictHook:
     def test_asdict(self):