Merge branch '3.x-line' into dev

marshmallow-code · Jan 31, 2025 · bc5cde0 · bc5cde0
2 parents f279186 + 7d15bae
commit bc5cde0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -121,6 +121,15 @@ Previously-deprecated APIs have been removed, including:
 - ``Field.fail``, which was replaced by ``Field.make_error`` in 3.0.0.
 - `json_module` class Meta option (deprecated in 3.0.0b3). Use `render_module` instead.
 
+(unreleased)
+************
+
+Other changes:
+
+- Remove default value for the ``data`` param of `Nested._deserialize <marshmallow.fields.Nested._deserialize>` (:issue:`2802`).
+  Thanks :user:`gbenson` for reporting.
+
+
 3.26.0 (2025-01-22)
 *******************
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -63,10 +63,7 @@ include = [
 exclude = ["docs/_build/"]
 
 [tool.ruff]
-src = ["src", "tests", "examples"]
 fix = true
-show-fixes = true
-output-format = "full"
 
 [tool.ruff.format]
 docstring-code-format = true

diff --git a/src/marshmallow/fields.py b/src/marshmallow/fields.py
@@ -599,7 +599,7 @@ def _deserialize(
         self,
         value: typing.Any,
         attr: str | None,
-        data: typing.Mapping[str, typing.Any] | None = None,
+        data: typing.Mapping[str, typing.Any] | None,
         partial: bool | types.StrSequenceOrSet | None = None,
         **kwargs,
     ):