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

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

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+1.4.0 (2026-02-04)
+******************
+
+Bug fixes:
+
+* Add missing commas in error message for ``validate.FileType`` (:pr:`374`).
+
+Support:
+
+* Support Python 3.10-3.14 (:pr:`376`).
+
 1.3.0 (2025-01-06)
 ******************
 

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

@@ -1,29 +1,30 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: flask-marshmallow
-Version: 1.3.0
+Version: 1.4.0
 Summary: Flask + marshmallow for beautiful APIs
-Maintainer-email: Steven Loria <sloria1@gmail.com>, Stephen Rosen <sirosen0@gmail.com>
-Requires-Python: >=3.9
+Maintainer-email: Steven Loria <oss@stevenloria.com>, Stephen Rosen <sirosen0@gmail.com>
+Requires-Python: >=3.10
 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.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: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+License-File: LICENSE
 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,<5.0 ; extra == "dev"
+Requires-Dist: pre-commit>=4.5,<5.0 ; extra == "dev"
 Requires-Dist: marshmallow-sqlalchemy>=0.19.0 ; extra == "docs"
-Requires-Dist: Sphinx==8.1.3 ; extra == "docs"
-Requires-Dist: sphinx-issues==5.0.0 ; extra == "docs"
+Requires-Dist: Sphinx==9.1.0 ; extra == "docs"
+Requires-Dist: sphinx-issues==5.0.1 ; 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"

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

@@ -1,11 +1,11 @@
 [project]
 name = "flask-marshmallow"
-version = "1.3.0"
+version = "1.4.0"
 description = "Flask + marshmallow for beautiful APIs"
 readme = "README.rst"
 license = { file = "LICENSE" }
 maintainers = [
-  { name = "Steven Loria", email = "sloria1@gmail.com" },
+  { name = "Steven Loria", email = "oss@stevenloria.com" },
   { name = "Stephen Rosen", email = "sirosen0@gmail.com" },
 ]
 classifiers = [
@@ -14,14 +14,14 @@ classifiers = [
   "License :: OSI Approved :: MIT License",
   "Natural Language :: English",
   "Programming Language :: Python :: 3",
-  "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",
+  "Programming Language :: Python :: 3.14",
   "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 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==8.1.3",
-  "sphinx-issues==5.0.0",
+  "Sphinx==9.1.0",
+  "sphinx-issues==5.0.1",
 ]
 tests = ["flask-marshmallow[sqlalchemy]", "pytest"]
-dev = ["flask-marshmallow[tests]", "tox", "pre-commit>=3.5,<5.0"]
+dev = ["flask-marshmallow[tests]", "tox", "pre-commit>=4.5,<5.0"]
 sqlalchemy = ["flask-sqlalchemy>=3.0.0", "marshmallow-sqlalchemy>=0.29.0"]
 
 [build-system]

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

@@ -134,6 +134,12 @@ class Marshmallow:
         # If using Flask-SQLAlchemy, attach db.session to SQLAlchemySchema
         if has_sqla and "sqlalchemy" in app.extensions:
             db = app.extensions["sqlalchemy"]
-            self.SQLAlchemySchema.OPTIONS_CLASS.session = db.session
-            self.SQLAlchemyAutoSchema.OPTIONS_CLASS.session = db.session
+            SQLAlchemySchemaOpts = typing.cast(
+                sqla.SQLAlchemySchemaOpts, self.SQLAlchemySchema.OPTIONS_CLASS
+            )
+            SQLAlchemySchemaOpts.session = db.session
+            SQLAlchemyAutoSchemaOpts = typing.cast(
+                sqla.SQLAlchemyAutoSchemaOpts, self.SQLAlchemySchema.OPTIONS_CLASS
+            )
+            SQLAlchemyAutoSchemaOpts.session = db.session
         app.extensions[EXTENSION_NAME] = self

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

@@ -119,7 +119,7 @@ class URLFor(fields.Field):
                     param_values[name] = attribute_value
                 else:
                     raise AttributeError(
-                        f"{attr_name!r} is not a valid " f"attribute of {obj!r}"
+                        f"{attr_name!r} is not a valid attribute of {obj!r}"
                     )
             else:
                 param_values[name] = attr_tpl

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

@@ -180,7 +180,7 @@ class FileType(Validator):
 
     def _format_error(self, value):
         return (self.error or self.default_message).format(
-            input=value, extensions="".join(self.allowed_types)
+            input=value, extensions=",".join(self.allowed_types)
         )
 
     def __call__(self, value):

{flask_marshmallow-1.3.0 → flask_marshmallow-1.4.0}/tests/test_validate.py

@@ -165,4 +165,4 @@ def test_filetype():
         match=r"Not an allowed file type. Allowed file types: \[.*?\]",  # noqa: W605
     ):
         no_ext_fs = FileStorage(io.BytesIO(b"".ljust(1024)), "test")
-        validate.FileType([".png"])(no_ext_fs)
+        validate.FileType([".png", ".jpg"])(no_ext_fs)

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

@@ -1,9 +1,9 @@
 [tox]
 envlist=
     lint
-    py{39,310,311,312,313}
-    py313-marshmallowdev
-    py39-lowest
+    py{310,311,312,313,314}
+    py314-marshmallowdev
+    py310-lowest
     docs
 
 [testenv]
@@ -20,7 +20,7 @@ deps =
 commands = pytest {posargs}
 
 [testenv:lint]
-deps = pre-commit~=3.5
+deps = pre-commit~=4.5.1
 skip_install = true
 commands = pre-commit run --all-files
 
@@ -30,13 +30,13 @@ commands = sphinx-build docs/ docs/_build {posargs}
 
 ; Below tasks are for development only (not run in CI)
 
-[testenv:watch-docs]
-deps =
-  sphinx-autobuild
+[testenv:docs-serve]
+deps = sphinx-autobuild
 extras = docs
-commands = sphinx-autobuild --open-browser docs/ docs/_build {posargs} --watch src/flask_marshmallow --delay 2
+commands = sphinx-autobuild --port=0 --open-browser --delay=2 docs/ docs/_build {posargs} --watch src --watch CONTRIBUTING.rst --watch README.rst
 
-[testenv:watch-readme]
+[testenv:readme-serve]
 deps = restview
 skip_install = true
 commands = restview README.rst
+