marshmallow 3.26.0__tar.gz → 3.26.1__tar.gz

{marshmallow-3.26.0 → marshmallow-3.26.1}/CHANGELOG.rst

@@ -1,6 +1,20 @@
 Changelog
 ---------
 
+3.26.1 (2025-02-03)
+*******************
+
+Bug fixes:
+
+- Typing: Fix type annotations for `class Meta <marshmallow.Schema.Meta>` options (:issue:`2804`).
+  Thanks :user:`lawrence-law` for reporting.
+
+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)
 *******************
 

{marshmallow-3.26.0 → marshmallow-3.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: marshmallow
-Version: 3.26.0
+Version: 3.26.1
 Summary: A lightweight library for converting complex datatypes to and from native Python datatypes.
 Author-email: Steven Loria <sloria1@gmail.com>
 Maintainer-email: Steven Loria <sloria1@gmail.com>, Jérôme Lafréchoux <jerome@jolimont.fr>, Jared Deckard <jared@shademaps.com>

{marshmallow-3.26.0 → marshmallow-3.26.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "marshmallow"
-version = "3.26.0"
+version = "3.26.1"
 description = "A lightweight library for converting complex datatypes to and from native Python datatypes."
 readme = "README.rst"
 license = { file = "LICENSE" }
@@ -60,10 +60,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

{marshmallow-3.26.0 → marshmallow-3.26.1}/src/marshmallow/fields.py

@@ -675,7 +675,7 @@ class Nested(Field):
         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,
     ) -> typing.Any:

{marshmallow-3.26.0 → marshmallow-3.26.1}/src/marshmallow/schema.py

@@ -384,9 +384,9 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         .. versionchanged:: 3.26.0 Deprecate `ordered`. Field order is preserved by default.
         """
 
-        fields: typing.ClassVar[tuple[Field] | list[Field]]
+        fields: typing.ClassVar[tuple[str, ...] | list[str]]
         """Fields to include in the (de)serialized result"""
-        additional: typing.ClassVar[tuple[Field] | list[Field]]
+        additional: typing.ClassVar[tuple[str, ...] | list[str]]
         """Fields to include in addition to the explicitly declared fields.
         `additional <marshmallow.Schema.Meta.additional>` and `fields <marshmallow.Schema.Meta.fields>`
         are mutually-exclusive options.
@@ -396,7 +396,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         usually better to define fields as class variables, but you may need to
         use this option, e.g., if your fields are Python keywords.
         """
-        exclude: typing.ClassVar[tuple[Field] | list[Field]]
+        exclude: typing.ClassVar[tuple[str, ...] | list[str]]
         """Fields to exclude in the serialized result.
         Nested fields can be represented with dot delimiters.
         """
@@ -408,7 +408,10 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         """Default format for `DateTime <marshmallow.fields.DateTime>` fields."""
         timeformat: typing.ClassVar[str]
         """Default format for `Time <marshmallow.fields.Time>` fields."""
-        render_module: typing.ClassVar[types.RenderModule]
+
+        # FIXME: Use a more constrained type here.
+        # ClassVar[RenderModule] doesn't work.
+        render_module: typing.Any
         """ Module to use for `loads <marshmallow.Schema.loads>` and `dumps <marshmallow.Schema.dumps>`.
         Defaults to `json` from the standard library.
         """
@@ -416,9 +419,9 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         """If `True`, `Schema.dump <marshmallow.Schema.dump>` is a `collections.OrderedDict`."""
         index_errors: typing.ClassVar[bool]
         """If `True`, errors dictionaries will include the index of invalid items in a collection."""
-        load_only: typing.ClassVar[tuple[Field] | list[Field]]
+        load_only: typing.ClassVar[tuple[str, ...] | list[str]]
         """Fields to exclude from serialized results"""
-        dump_only: typing.ClassVar[tuple[Field] | list[Field]]
+        dump_only: typing.ClassVar[tuple[str, ...] | list[str]]
         """Fields to exclude from serialized results"""
         unknown: typing.ClassVar[str]
         """Whether to exclude, include, or raise an error for unknown fields in the data.

marshmallow-3.26.1/tests/mypy_test_cases/test_schema.py

@@ -0,0 +1,29 @@
+import json
+
+from marshmallow import EXCLUDE, Schema
+from marshmallow.fields import Integer, String
+
+
+# Test that valid `Meta` class attributes pass type checking
+class MySchema(Schema):
+    foo = String()
+    bar = Integer()
+
+    class Meta(Schema.Meta):
+        fields = ("foo", "bar")
+        additional = ("baz", "qux")
+        include = {
+            "foo2": String(),
+        }
+        exclude = ("bar", "baz")
+        many = True
+        dateformat = "%Y-%m-%d"
+        datetimeformat = "%Y-%m-%dT%H:%M:%S"
+        timeformat = "%H:%M:%S"
+        render_module = json
+        ordered = False
+        index_errors = True
+        load_only = ("foo", "bar")
+        dump_only = ("baz", "qux")
+        unknown = EXCLUDE
+        register = False