Merge branch '3.x-line' into dev

marshmallow-code · Jan 11, 2025 · 324de2b · 324de2b
2 parents 7d2efd4 + 8f3d0e7
commit 324de2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -105,9 +105,16 @@ Previously-deprecated API have been removed, including:
 - `marshmallow.utils.pprint` (deprecated in 3.7.0). Use `pprint.pprint` instead.
 - Remove ``__version__``, ``__parsed_version__``, and ``__version_info__`` attributes which were deprecated in 3.21.0.
 
-3.25.1 (unreleased)
+3.25.1 (2025-01-11)
 *******************
 
+Bug fixes:
+
+- Typing: Fix type annotations for `Tuple <marshmallow.fields.Tuple>`,
+  `Boolean <marshmallow.fields.Boolean>`, and `Pluck <marshmallow.fields.Pluck>`
+  constructors (:pr:`2756`).
+- Typing: Fix overload for `marshmallow.class_registry.get_class` (:pr:`2756`).
+
 Documentation:
 
 - Various documentation improvements (:pr:`2746`, :pr:`2747`, :pr:`2748`, :pr:`2749`, :pr:`2750`, :pr:`2751`).

diff --git a/src/marshmallow/class_registry.py b/src/marshmallow/class_registry.py
@@ -80,7 +80,7 @@ def get_class(classname: str, all: typing.Literal[True] = ...) -> list[SchemaTyp
 def get_class(classname: str, all: bool = False) -> list[SchemaType] | SchemaType:
     """Retrieve a class from the registry.
 
-    :raises: marshmallow.exceptions.RegistryError if the class cannot be found
+    :raises: `marshmallow.exceptions.RegistryError` if the class cannot be found
         or if there are multiple entries for the given class name.
     """
     try: