flask-marshmallow 1.2.1__tar.gz → 1.3.0__tar.gz

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/CHANGELOG.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+1.3.0 (2025-01-06)
+******************
+
+Support:
+
+* Support Python 3.9-3.13 (:pr:`347`).
+* Support marshmallow 4.0.0 (:pr:`347`).
+
 1.2.1 (2024-03-18)
 ******************
 

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/PKG-INFO

@@ -1,29 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: flask-marshmallow
-Version: 1.2.1
+Version: 1.3.0
 Summary: Flask + marshmallow for beautiful APIs
 Maintainer-email: Steven Loria <sloria1@gmail.com>, Stephen Rosen <sirosen0@gmail.com>
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Dist: Flask>=2.2
 Requires-Dist: marshmallow>=3.0.0
 Requires-Dist: flask-marshmallow[tests] ; extra == "dev"
 Requires-Dist: tox ; extra == "dev"
-Requires-Dist: pre-commit~=3.5 ; extra == "dev"
+Requires-Dist: pre-commit>=3.5,<5.0 ; extra == "dev"
 Requires-Dist: marshmallow-sqlalchemy>=0.19.0 ; extra == "docs"
-Requires-Dist: Sphinx==7.2.6 ; extra == "docs"
-Requires-Dist: sphinx-issues==4.0.0 ; extra == "docs"
+Requires-Dist: Sphinx==8.1.3 ; extra == "docs"
+Requires-Dist: sphinx-issues==5.0.0 ; extra == "docs"
 Requires-Dist: flask-sqlalchemy>=3.0.0 ; extra == "sqlalchemy"
 Requires-Dist: marshmallow-sqlalchemy>=0.29.0 ; extra == "sqlalchemy"
 Requires-Dist: flask-marshmallow[sqlalchemy] ; extra == "tests"
@@ -39,7 +39,7 @@ Provides-Extra: tests
 Flask-Marshmallow
 *****************
 
-|pypi-package| |build-status| |docs| |marshmallow3|
+|pypi-package| |build-status| |docs| |marshmallow-support|
 
 Flask + marshmallow for beautiful APIs
 ======================================
@@ -82,9 +82,8 @@ Define your output format with marshmallow.
 
 
     class UserSchema(ma.Schema):
-        class Meta:
-            # Fields to expose
-            fields = ("email", "date_created", "_links")
+        email = ma.Email()
+        date_created = ma.DateTime()
 
         # Smart hyperlinking
         _links = ma.Hyperlinks(
@@ -164,7 +163,7 @@ MIT licensed. See the bundled `LICENSE <https://github.com/marshmallow-code/flas
    :target: https://flask-marshmallow.readthedocs.io/
    :alt: Documentation
 
-.. |marshmallow3| image:: https://badgen.net/badge/marshmallow/3
+.. |marshmallow-support| image:: https://badgen.net/badge/marshmallow/3,4?list=1
     :target: https://marshmallow.readthedocs.io/en/latest/upgrading.html
-    :alt: marshmallow 3 compatible
+    :alt: marshmallow 3|4 compatible
 

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/README.rst

@@ -2,7 +2,7 @@
 Flask-Marshmallow
 *****************
 
-|pypi-package| |build-status| |docs| |marshmallow3|
+|pypi-package| |build-status| |docs| |marshmallow-support|
 
 Flask + marshmallow for beautiful APIs
 ======================================
@@ -45,9 +45,8 @@ Define your output format with marshmallow.
 
 
     class UserSchema(ma.Schema):
-        class Meta:
-            # Fields to expose
-            fields = ("email", "date_created", "_links")
+        email = ma.Email()
+        date_created = ma.DateTime()
 
         # Smart hyperlinking
         _links = ma.Hyperlinks(
@@ -127,6 +126,6 @@ MIT licensed. See the bundled `LICENSE <https://github.com/marshmallow-code/flas
    :target: https://flask-marshmallow.readthedocs.io/
    :alt: Documentation
 
-.. |marshmallow3| image:: https://badgen.net/badge/marshmallow/3
+.. |marshmallow-support| image:: https://badgen.net/badge/marshmallow/3,4?list=1
     :target: https://marshmallow.readthedocs.io/en/latest/upgrading.html
-    :alt: marshmallow 3 compatible
+    :alt: marshmallow 3|4 compatible

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/docs/index.rst

@@ -49,9 +49,8 @@ Define your output format with marshmallow.
 
 
     class UserSchema(ma.Schema):
-        class Meta:
-            # Fields to expose
-            fields = ("email", "date_created", "_links")
+        email = ma.Email()
+        date_created = ma.DateTime()
 
         # Smart hyperlinking
         _links = ma.Hyperlinks(

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flask-marshmallow"
-version = "1.2.1"
+version = "1.3.0"
 description = "Flask + marshmallow for beautiful APIs"
 readme = "README.rst"
 license = { file = "LICENSE" }
@@ -14,14 +14,14 @@ classifiers = [
   "License :: OSI Approved :: MIT License",
   "Natural Language :: English",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = ["Flask>=2.2", "marshmallow>=3.0.0"]
 
 [project.urls]
@@ -31,11 +31,11 @@ Funding = "https://opencollective.com/marshmallow"
 [project.optional-dependencies]
 docs = [
   "marshmallow-sqlalchemy>=0.19.0",
-  "Sphinx==7.2.6",
-  "sphinx-issues==4.0.0",
+  "Sphinx==8.1.3",
+  "sphinx-issues==5.0.0",
 ]
 tests = ["flask-marshmallow[sqlalchemy]", "pytest"]
-dev = ["flask-marshmallow[tests]", "tox", "pre-commit~=3.5"]
+dev = ["flask-marshmallow[tests]", "tox", "pre-commit>=3.5,<5.0"]
 sqlalchemy = ["flask-sqlalchemy>=3.0.0", "marshmallow-sqlalchemy>=0.29.0"]
 
 [build-system]

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/src/flask_marshmallow/__init__.py

@@ -9,7 +9,15 @@ with your Flask application.
 import typing
 import warnings
 
-from marshmallow import exceptions, pprint
+from marshmallow import exceptions
+
+try:
+    # Available in marshmallow 3 only
+    from marshmallow import pprint  # noqa: F401
+except ImportError:
+    _has_pprint = False
+else:
+    _has_pprint = True
 from marshmallow import fields as base_fields
 
 from . import fields
@@ -41,8 +49,9 @@ __all__ = [
     "Schema",
     "fields",
     "exceptions",
-    "pprint",
 ]
+if _has_pprint:
+    __all__.append("pprint")
 
 EXTENSION_NAME = "flask-marshmallow"
 
@@ -75,9 +84,8 @@ class Marshmallow:
     You can declare schema like so::
 
         class BookSchema(ma.Schema):
-            class Meta:
-                fields = ("id", "title", "author", "links")
-
+            id = ma.Integer(dump_only=True)
+            title = ma.String(required=True)
             author = ma.Nested(AuthorSchema)
 
             links = ma.Hyperlinks(

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/src/flask_marshmallow/fields.py

@@ -8,6 +8,8 @@ See the `marshmallow.fields` module for the list of all fields available from th
 marshmallow library.
 """
 
+from __future__ import annotations
+
 import re
 import typing
 from collections.abc import Sequence
@@ -29,7 +31,7 @@ __all__ = [
 _tpl_pattern = re.compile(r"\s*<\s*(\S*)\s*>\s*")
 
 
-def _tpl(val: str) -> typing.Optional[str]:
+def _tpl(val: str) -> str | None:
     """Return value within ``< >`` if possible, else return ``None``."""
     match = _tpl_pattern.match(val)
     if match:
@@ -95,7 +97,7 @@ class URLFor(fields.Field):
     def __init__(
         self,
         endpoint: str,
-        values: typing.Optional[typing.Dict[str, typing.Any]] = None,
+        values: dict[str, typing.Any] | None = None,
         **kwargs,
     ):
         self.endpoint = endpoint
@@ -133,7 +135,7 @@ class AbsoluteURLFor(URLFor):
     def __init__(
         self,
         endpoint: str,
-        values: typing.Optional[typing.Dict[str, typing.Any]] = None,
+        values: dict[str, typing.Any] | None = None,
         **kwargs,
     ):
         if values:
@@ -146,9 +148,7 @@ class AbsoluteURLFor(URLFor):
 AbsoluteUrlFor = AbsoluteURLFor
 
 
-def _rapply(
-    d: typing.Union[dict, typing.Iterable], func: typing.Callable, *args, **kwargs
-):
+def _rapply(d: dict | typing.Iterable, func: typing.Callable, *args, **kwargs):
     """Apply a function to all values in a dictionary or
     list of dictionaries, recursively.
     """
@@ -201,7 +201,7 @@ class Hyperlinks(fields.Field):
 
     _CHECK_ATTRIBUTE = False
 
-    def __init__(self, schema: typing.Dict[str, typing.Union[URLFor, str]], **kwargs):
+    def __init__(self, schema: dict[str, URLFor | str], **kwargs):
         self.schema = schema
         fields.Field.__init__(self, **kwargs)
 
@@ -229,8 +229,8 @@ class File(fields.Field):
     def deserialize(
         self,
         value: typing.Any,
-        attr: typing.Optional[str] = None,
-        data: typing.Optional[typing.Mapping[str, typing.Any]] = None,
+        attr: str | None = None,
+        data: typing.Mapping[str, typing.Any] | None = None,
         **kwargs,
     ):
         if isinstance(value, Sequence) and len(value) == 0:

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/src/flask_marshmallow/schema.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import typing
 
 import flask
@@ -14,8 +16,8 @@ class Schema(ma.Schema):
     """
 
     def jsonify(
-        self, obj: typing.Any, many: typing.Optional[bool] = None, *args, **kwargs
-    ) -> "Response":
+        self, obj: typing.Any, many: bool | None = None, *args, **kwargs
+    ) -> Response:
         """Return a JSON response containing the serialized data.
 
 

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/src/flask_marshmallow/sqla.py

@@ -8,6 +8,8 @@ Integration with Flask-SQLAlchemy and marshmallow-sqlalchemy. Provides
 that use the scoped session from Flask-SQLAlchemy.
 """
 
+from __future__ import annotations
+
 from urllib import parse
 
 import marshmallow_sqlalchemy as msqla

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/src/flask_marshmallow/validate.py

@@ -5,6 +5,8 @@ flask_marshmallow.validate
 Custom validation classes for various types of data.
 """
 
+from __future__ import annotations
+
 import io
 import os
 import re
@@ -91,11 +93,11 @@ class FileSize(Validator):
 
     def __init__(
         self,
-        min: typing.Optional[str] = None,
-        max: typing.Optional[str] = None,
+        min: str | None = None,
+        max: str | None = None,
         min_inclusive: bool = True,
         max_inclusive: bool = True,
-        error: typing.Optional[str] = None,
+        error: str | None = None,
     ):
         self.min = min
         self.max = max
@@ -171,7 +173,7 @@ class FileType(Validator):
     def __init__(
         self,
         accept: typing.Iterable[str],
-        error: typing.Optional[str] = None,
+        error: str | None = None,
     ):
         self.allowed_types = {ext.lower() for ext in accept}
         self.error = error or self.default_message

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/tests/conftest.py

@@ -84,9 +84,8 @@ def ma(app):
 @pytest.fixture
 def schemas(ma):
     class AuthorSchema(ma.Schema):
-        class Meta:
-            fields = ("id", "name", "absolute_url", "links")
-
+        id = ma.Integer()
+        name = ma.String()
         absolute_url = ma.AbsoluteURLFor("author", values={"id": "<id>"})
 
         links = ma.Hyperlinks(
@@ -97,9 +96,8 @@ def schemas(ma):
         )
 
     class BookSchema(ma.Schema):
-        class Meta:
-            fields = ("id", "title", "author", "links")
-
+        id = ma.Integer()
+        title = ma.String()
         author = ma.Nested(AuthorSchema)
 
         links = ma.Hyperlinks(

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/tests/test_sqla.py

@@ -48,7 +48,10 @@ class TestSQLAlchemy:
 
     @pytest.fixture
     def db(self, extapp):
-        return extapp.extensions["sqlalchemy"]
+        db = extapp.extensions["sqlalchemy"]
+        yield db
+        db.session.close()
+        db.engine.dispose()
 
     @pytest.fixture
     def extma(self, extapp):

{flask_marshmallow-1.2.1 → flask_marshmallow-1.3.0}/tox.ini

@@ -1,9 +1,9 @@
 [tox]
 envlist=
     lint
-    py{38,39,310,311,312}
-    py312-marshmallowdev
-    py38-lowest
+    py{39,310,311,312,313}
+    py313-marshmallowdev
+    py39-lowest
     docs
 
 [testenv]