Merge pull request #1023 from marshmallow-code/bump_frameworks

Bump supported framework versions

Author: lafrech

.github/workflows/build-release.yml

@@ -13,10 +13,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: "3.10", python: "3.10", tox: py310-marshmallow3 }
-          - { name: "3.14", python: "3.14", tox: py314-marshmallow3 }
-          - { name: "3.10", python: "3.10", tox: py310-marshmallow4 }
-          - { name: "3.14", python: "3.14", tox: py314-marshmallow4 }
+          - { name: "3.10", python: "3.10", tox: py310-marshmallow }
+          - { name: "3.14", python: "3.14", tox: py314-marshmallow }
           - { name: "lowest", python: "3.10", tox: py310-lowest }
           - { name: "dev", python: "3.14", tox: py314-marshmallowdev }
     steps:

pyproject.toml

@@ -42,7 +42,7 @@ keywords = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-    "marshmallow>=3.13.0,<5.0.0",
+    "marshmallow>=4.0.0,<5.0.0",
     "packaging>=17.0",
     # depend on typing-extensions conditionally for annotations
     'typing_extensions>=4.0; python_version<"3.10"',
@@ -57,13 +57,13 @@ Tidelift = "https://tidelift.com/subscription/pkg/pypi-webargs?utm_source=pypi-w
 
 [project.optional-dependencies]
 frameworks = [
-  "Flask>=0.12.5",
-  "Django>=2.2.0",
+  "Flask>=3.1.0",
+  "Django>=5.2.0",
   "bottle>=0.13.0",
-  "tornado>=6.0.0",
-  "pyramid>=1.9.1",
-  "falcon>=2.0.0",
-  "aiohttp>=3.0.8",
+  "tornado>=6.5.0",
+  "pyramid>=2.0.2",
+  "falcon>=4.1.0",
+  "aiohttp>=3.13.0",
 ]
 tests = [
   "webargs[frameworks]",

src/webargs/fields.py

@@ -1,7 +1,6 @@
 """Field classes.
 
-Includes all fields from `marshmallow.fields` in addition to a custom
-`Nested` field and `DelimitedList`.
+Includes all fields from `marshmallow.fields` in addition to `DelimitedList`.
 
 All fields can optionally take a special `location` keyword argument, which
 tells webargs where to parse the request argument from.
@@ -26,30 +25,6 @@
 __all__ = ["DelimitedList", "DelimitedTuple"] + ma.fields.__all__
 
 
-# TODO: remove custom `Nested` in the next major release
-#
-# the `Nested` class is only needed on versions of marshmallow prior to v3.15.0
-# in that version, `ma.fields.Nested` gained the ability to consume dict inputs
-# prior to that, this subclass adds this capability
-#
-# if we drop support for ma.__version_info__ < (3, 15) we can do this
-class Nested(ma.fields.Nested):  # type: ignore[no-redef]
-    """Same as `marshmallow.fields.Nested`, except can be passed a dictionary
-    as the first argument, which will be converted to a `marshmallow.Schema`.
-
-    .. note::
-
-        The schema class here will always be `marshmallow.Schema`, regardless
-        of whether a custom schema class is set on the parser. Pass an explicit schema
-        class if necessary.
-    """
-
-    def __init__(self, nested, *args, **kwargs):
-        if isinstance(nested, dict):
-            nested = ma.Schema.from_dict(nested)
-        super().__init__(nested, *args, **kwargs)
-
-
 class DelimitedFieldMixin:
     """
     This is a mixin class for subclasses of ma.fields.List and ma.fields.Tuple

tests/apps/django_app/__init__.py

@@ -1,4 +1 @@
-import importlib.metadata
 
-DJANGO_MAJOR_VERSION = int(importlib.metadata.version("django").split(".")[0])
-DJANGO_SUPPORTS_ASYNC = DJANGO_MAJOR_VERSION >= 3

tests/apps/falcon_app.py

@@ -1,5 +1,3 @@
-import importlib.metadata
-
 import falcon
 import marshmallow as ma
 
@@ -10,9 +8,6 @@
 hello_args = {"name": fields.Str(load_default="World", validate=validate.Length(min=3))}
 hello_multiple = {"name": fields.List(fields.Str())}
 
-FALCON_MAJOR_VERSION = int(importlib.metadata.version("falcon").split(".")[0])
-FALCON_SUPPORTS_ASYNC = FALCON_MAJOR_VERSION >= 3
-
 
 class HelloSchema(ma.Schema):
     name = fields.Str(load_default="World", validate=validate.Length(min=3))
@@ -25,10 +20,7 @@ class HelloSchema(ma.Schema):
 
 
 def set_text(resp, value):
-    if FALCON_MAJOR_VERSION >= 3:
-        resp.text = value
-    else:
-        resp.body = value
+    resp.text = value
 
 
 class Echo:
@@ -191,11 +183,7 @@ def on_get(self, req, resp):
 
 
 def create_app():
-    if FALCON_MAJOR_VERSION >= 3:
-        app = falcon.App()
-    else:
-        app = falcon.API()
-
+    app = falcon.App()
     app.add_route("/echo", Echo())
     app.add_route("/echo_form", EchoForm())
     app.add_route("/echo_json", EchoJSON())

tests/apps/flask_app.py

@@ -1,5 +1,3 @@
-import importlib.metadata
-
 import marshmallow as ma
 from flask import Flask, Response, request
 from flask import jsonify as J
@@ -13,9 +11,6 @@
     use_kwargs,
 )
 
-FLASK_MAJOR_VERSION = int(importlib.metadata.version("flask").split(".")[0])
-FLASK_SUPPORTS_ASYNC = FLASK_MAJOR_VERSION >= 2
-
 
 class TestAppConfig:
     TESTING = True
@@ -138,12 +133,10 @@ def echo_headers_raising(args):
     return J(args)
 
 
-if FLASK_SUPPORTS_ASYNC:
-
-    @app.route("/echo_headers_raising_async")
-    @use_args(HelloSchema(), location="headers", unknown=None)
-    async def echo_headers_raising_async(args):
-        return J(args)
+@app.route("/echo_headers_raising_async")
+@use_args(HelloSchema(), location="headers", unknown=None)
+async def echo_headers_raising_async(args):
+    return J(args)
 
 
 @app.route("/echo_cookie")
@@ -165,14 +158,12 @@ def echo_view_arg(view_arg):
     return J(parser.parse({"view_arg": fields.Int()}, location="view_args"))
 
 
-if FLASK_SUPPORTS_ASYNC:
-
-    @app.route("/echo_view_arg_async/<view_arg>")
-    async def echo_view_arg_async(view_arg):
-        parsed_view_arg = await parser.async_parse(
-            {"view_arg": fields.Int()}, location="view_args"
-        )
-        return J(parsed_view_arg)
+@app.route("/echo_view_arg_async/<view_arg>")
+async def echo_view_arg_async(view_arg):
+    parsed_view_arg = await parser.async_parse(
+        {"view_arg": fields.Int()}, location="view_args"
+    )
+    return J(parsed_view_arg)
 
 
 @app.route("/echo_view_arg_use_args/<view_arg>")
@@ -181,12 +172,10 @@ def echo_view_arg_with_use_args(args, **kwargs):
     return J(args)
 
 
-if FLASK_SUPPORTS_ASYNC:
-
-    @app.route("/echo_view_arg_use_args_async/<view_arg>")
-    @use_args({"view_arg": fields.Int()}, location="view_args")
-    async def echo_view_arg_with_use_args_async(args, **kwargs):
-        return J(args)
+@app.route("/echo_view_arg_use_args_async/<view_arg>")
+@use_args({"view_arg": fields.Int()}, location="view_args")
+async def echo_view_arg_with_use_args_async(args, **kwargs):
+    return J(args)
 
 
 @app.route("/echo_nested", methods=["POST"])
@@ -211,16 +200,12 @@ def echo_nested_many_with_data_key():
     return J(parser.parse(args))
 
 
-if FLASK_SUPPORTS_ASYNC:
-
-    @app.route("/echo_nested_many_data_key_async", methods=["POST"])
-    async def echo_nested_many_with_data_key_async():
-        args = {
-            "x_field": fields.Nested(
-                {"id": fields.Int()}, many=True, data_key="X-Field"
-            )
-        }
-        return J(await parser.async_parse(args))
+@app.route("/echo_nested_many_data_key_async", methods=["POST"])
+async def echo_nested_many_with_data_key_async():
+    args = {
+        "x_field": fields.Nested({"id": fields.Int()}, many=True, data_key="X-Field")
+    }
+    return J(await parser.async_parse(args))
 
 
 class EchoMethodViewUseArgs(MethodView):
@@ -235,17 +220,16 @@ def post(self, args):
 )
 
 
-if FLASK_SUPPORTS_ASYNC:
+class EchoMethodViewUseArgsAsync(MethodView):
+    @use_args({"val": fields.Int()})
+    async def post(self, args):
+        return J(args)
 
-    class EchoMethodViewUseArgsAsync(MethodView):
-        @use_args({"val": fields.Int()})
-        async def post(self, args):
-            return J(args)
 
-    app.add_url_rule(
-        "/echo_method_view_use_args_async",
-        view_func=EchoMethodViewUseArgsAsync.as_view("echo_method_view_use_args_async"),
-    )
+app.add_url_rule(
+    "/echo_method_view_use_args_async",
+    view_func=EchoMethodViewUseArgsAsync.as_view("echo_method_view_use_args_async"),
+)
 
 
 class EchoMethodViewUseKwargs(MethodView):
@@ -259,19 +243,17 @@ def post(self, val):
     view_func=EchoMethodViewUseKwargs.as_view("echo_method_view_use_kwargs"),
 )
 
-if FLASK_SUPPORTS_ASYNC:
 
-    class EchoMethodViewUseKwargsAsync(MethodView):
-        @use_kwargs({"val": fields.Int()})
-        async def post(self, val):
-            return J({"val": val})
+class EchoMethodViewUseKwargsAsync(MethodView):
+    @use_kwargs({"val": fields.Int()})
+    async def post(self, val):
+        return J({"val": val})
 
-    app.add_url_rule(
-        "/echo_method_view_use_kwargs_async",
-        view_func=EchoMethodViewUseKwargsAsync.as_view(
-            "echo_method_view_use_kwargs_async"
-        ),
-    )
+
+app.add_url_rule(
+    "/echo_method_view_use_kwargs_async",
+    view_func=EchoMethodViewUseKwargsAsync.as_view("echo_method_view_use_kwargs_async"),
+)
 
 
 @app.route("/echo_use_kwargs_missing", methods=["post"])
@@ -281,13 +263,11 @@ def echo_use_kwargs_missing(username, **kwargs):
     return J({"username": username})
 
 
-if FLASK_SUPPORTS_ASYNC:
-
-    @app.route("/echo_use_kwargs_missing_async", methods=["post"])
-    @use_kwargs({"username": fields.Str(required=True), "password": fields.Str()})
-    async def echo_use_kwargs_missing_async(username, **kwargs):
-        assert "password" not in kwargs
-        return J({"username": username})
+@app.route("/echo_use_kwargs_missing_async", methods=["post"])
+@use_kwargs({"username": fields.Str(required=True), "password": fields.Str()})
+async def echo_use_kwargs_missing_async(username, **kwargs):
+    assert "password" not in kwargs
+    return J({"username": username})
 
 
 # Return validation errors as JSON

tests/test_core.py

@@ -1,6 +1,5 @@
 import collections
 import datetime
-import importlib.metadata
 import typing
 from unittest import mock
 
@@ -16,15 +15,12 @@
     pre_load,
     validates_schema,
 )
-from packaging.version import Version
 from werkzeug.datastructures import MultiDict as WerkMultiDict
 
 from webargs import ValidationError, fields
 from webargs.core import Parser, get_mimetype, is_json
 from webargs.multidictproxy import MultiDictProxy
 
-MARSHMALLOW_VERSION = Version(importlib.metadata.version("marshmallow"))
-
 
 class MockHTTPError(Exception):
     def __init__(self, status_code, headers):
@@ -557,27 +553,6 @@ def test_required_with_custom_error(parser, web_request):
     assert "We need foo" in excinfo.value.messages["json"]["foo"]
 
 
-@pytest.mark.filterwarnings("ignore:Returning `False` from a validator is deprecated")
-@pytest.mark.skipif(
-    MARSHMALLOW_VERSION.major >= 4,
-    reason="marshmallow 4+ does not support validators returning False",
-)
-def test_required_with_custom_error_and_validation_error(parser, web_request):
-    web_request.json = {"foo": ""}
-    args = {
-        "foo": fields.Str(
-            required="We need foo",
-            validate=lambda s: len(s) > 1,
-            error_messages={"validator_failed": "foo required length is 3"},
-        )
-    }
-    with pytest.raises(ValidationError) as excinfo:
-        # Test that `validate` receives dictionary of args
-        parser.parse(args, web_request)
-
-    assert "foo required length is 3" in excinfo.value.args[0]["foo"]
-
-
 def test_full_input_validator_receives_nonascii_input(web_request):
     def validate(val):
         return False

tests/test_djangoparser.py

@@ -1,6 +1,5 @@
 import pytest
 
-from tests.apps.django_app import DJANGO_SUPPORTS_ASYNC
 from tests.apps.django_app.base.wsgi import application
 from webargs.testing import CommonTestCase
 
@@ -29,14 +28,8 @@ def test_use_args_in_class_based_view_with_path_param(self, testapp):
         res = testapp.get("/echo_use_args_with_path_param_cbv/42?name=Fred")
         assert res.json == {"name": "Fred"}
 
-    @pytest.mark.skipif(
-        not DJANGO_SUPPORTS_ASYNC, reason="requires a django version with async support"
-    )
     def test_parse_querystring_args_async(self, testapp):
         assert testapp.get("/async_echo?name=Fred").json == {"name": "Fred"}
 
-    @pytest.mark.skipif(
-        not DJANGO_SUPPORTS_ASYNC, reason="requires a django version with async support"
-    )
     def test_async_use_args_decorator(self, testapp):
         assert testapp.get("/async_echo_use_args?name=Fred").json == {"name": "Fred"}

tests/test_falconparser.py

@@ -1,7 +1,7 @@
 import falcon.testing
 import pytest
 
-from tests.apps.falcon_app import FALCON_SUPPORTS_ASYNC, create_app, create_async_app
+from tests.apps.falcon_app import create_app, create_async_app
 from webargs.testing import CommonTestCase
 
 
@@ -73,17 +73,11 @@ def test_body_parsing_works_with_simulate(self):
         )
         assert res.json == {"name": "Fred"}
 
-    @pytest.mark.skipif(
-        not FALCON_SUPPORTS_ASYNC, reason="requires a falcon version with async support"
-    )
     def test_parse_querystring_args_async(self):
         app = create_async_app()
         client = falcon.testing.TestClient(app)
         assert client.simulate_get("/async_echo?name=Fred").json == {"name": "Fred"}
 
-    @pytest.mark.skipif(
-        not FALCON_SUPPORTS_ASYNC, reason="requires a falcon version with async support"
-    )
     def test_async_use_args_decorator(self):
         app = create_async_app()
         client = falcon.testing.TestClient(app)