marshmallow 3.23.1__tar.gz → 3.23.2__tar.gz

{marshmallow-3.23.1 → marshmallow-3.23.2}/CHANGELOG.rst

@@ -1,6 +1,16 @@
 Changelog
 ---------
 
+3.23.2 (2024-12-18)
+*******************
+
+Bug fixes:
+
+- Improve type hint formatting for ``Field``, ``Nested``, and ``Function`` fields
+  to resolve PyCharm warnings (:issue:`2268`).
+  Thanks :user:`Fares-Abubaker` for reporting and fixing.
+
+
 3.23.1 (2024-11-01)
 *******************
 

{marshmallow-3.23.1 → marshmallow-3.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: marshmallow
-Version: 3.23.1
+Version: 3.23.2
 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>
@@ -59,19 +59,6 @@ marshmallow: simplified object serialization
 
 **marshmallow** is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes.
 
-Sponsor Message
-===============
-
-Input an OpenAPI spec to generate API docs that look as good as Stripe's. `Request a preview <https://form.typeform.com/to/uc55zY0F>`_ of your docs on Fern.
-
-.. image:: https://github.com/user-attachments/assets/69916225-0d61-4bd7-b3b9-e378557673cb
-    :target: https://form.typeform.com/to/uc55zY0F
-    :align: center
-    :alt: Fern logo
-
-Example
-=======
-
 .. code-block:: python
 
     from datetime import date

{marshmallow-3.23.1 → marshmallow-3.23.2}/README.rst

@@ -22,19 +22,6 @@ marshmallow: simplified object serialization
 
 **marshmallow** is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes.
 
-Sponsor Message
-===============
-
-Input an OpenAPI spec to generate API docs that look as good as Stripe's. `Request a preview <https://form.typeform.com/to/uc55zY0F>`_ of your docs on Fern.
-
-.. image:: https://github.com/user-attachments/assets/69916225-0d61-4bd7-b3b9-e378557673cb
-    :target: https://form.typeform.com/to/uc55zY0F
-    :align: center
-    :alt: Fern logo
-
-Example
-=======
-
 .. code-block:: python
 
     from datetime import date

{marshmallow-3.23.1 → marshmallow-3.23.2}/docs/conf.py

@@ -36,7 +36,7 @@ exclude_patterns = ["_build"]
 html_theme_path = [alabaster.get_path()]
 html_theme = "alabaster"
 html_static_path = ["_static"]
-html_css_files = ["css/versionwarning.css", "css/sponsor-message.css"]
+html_css_files = ["css/versionwarning.css"]
 templates_path = ["_templates"]
 html_show_sourcelink = False
 

{marshmallow-3.23.1 → marshmallow-3.23.2}/docs/index.rst

@@ -6,15 +6,6 @@ marshmallow: simplified object serialization
 
 Release v\ |version|. (:doc:`Changelog <changelog>`)
 
-.. admonition:: Sponsor Message
-
-    Input an OpenAPI spec to generate API docs that look as good as Stripe's. `Request a preview <https://form.typeform.com/to/uc55zY0F>`_ of your docs on Fern.
-
-    .. image:: https://github.com/user-attachments/assets/69916225-0d61-4bd7-b3b9-e378557673cb
-        :target: https://form.typeform.com/to/uc55zY0F
-        :align: center
-        :alt: Fern logo
-
 .. include:: about.rst.inc
 
 Upgrading from an older version?

{marshmallow-3.23.1 → marshmallow-3.23.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "marshmallow"
-version = "3.23.1"
+version = "3.23.2"
 description = "A lightweight library for converting complex datatypes to and from native Python datatypes."
 readme = "README.rst"
 license = { file = "LICENSE" }

{marshmallow-3.23.1 → marshmallow-3.23.2}/src/marshmallow/fields.py

@@ -166,9 +166,9 @@ class Field(FieldABC):
         data_key: str | None = None,
         attribute: str | None = None,
         validate: (
-            None
-            | typing.Callable[[typing.Any], typing.Any]
+            typing.Callable[[typing.Any], typing.Any]
             | typing.Iterable[typing.Callable[[typing.Any], typing.Any]]
+            | None
         ) = None,
         required: bool = False,
         allow_none: bool | None = None,
@@ -321,8 +321,9 @@ class Field(FieldABC):
         self,
         attr: str,
         obj: typing.Any,
-        accessor: typing.Callable[[typing.Any, str, typing.Any], typing.Any]
-        | None = None,
+        accessor: (
+            typing.Callable[[typing.Any, str, typing.Any], typing.Any] | None
+        ) = None,
         **kwargs,
     ):
         """Pulls the value for the given key from the object, applies the
@@ -538,11 +539,15 @@ class Nested(Field):
 
     def __init__(
         self,
-        nested: SchemaABC
-        | SchemaMeta
-        | str
-        | dict[str, Field | type[Field]]
-        | typing.Callable[[], SchemaABC | SchemaMeta | dict[str, Field | type[Field]]],
+        nested: (
+            SchemaABC
+            | SchemaMeta
+            | str
+            | dict[str, Field | type[Field]]
+            | typing.Callable[
+                [], SchemaABC | SchemaMeta | dict[str, Field | type[Field]]
+            ]
+        ),
         *,
         dump_default: typing.Any = missing_,
         default: typing.Any = missing_,
@@ -2024,14 +2029,14 @@ class Function(Field):
     def __init__(
         self,
         serialize: (
-            None
-            | typing.Callable[[typing.Any], typing.Any]
+            typing.Callable[[typing.Any], typing.Any]
             | typing.Callable[[typing.Any, dict], typing.Any]
+            | None
         ) = None,
         deserialize: (
-            None
-            | typing.Callable[[typing.Any], typing.Any]
+            typing.Callable[[typing.Any], typing.Any]
             | typing.Callable[[typing.Any, dict], typing.Any]
+            | None
         ) = None,
         **kwargs,
     ):

marshmallow-3.23.1/docs/_static/css/sponsor-message.css

@@ -1,15 +0,0 @@
-/* Override alabaster's admonition styling, which we used for sponsored messages */
-
-div.admonition-sponsor-message p.admonition-title {
-  font-size: 18px;
-  font-style: normal;
-}
-
-p.admonition-title::after  {
-  content: "";
-}
-
-div.admonition-sponsor-message p {
-  font-size: 14px;
-  font-style: italic;
-}