From fd626f9d0587992ca5b119d3f10b85f24fe4ab60 Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Fri, 26 Aug 2022 10:28:04 +0200 Subject: [PATCH 1/2] default -> dump_default --- marshmallow_jsonschema/base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/marshmallow_jsonschema/base.py b/marshmallow_jsonschema/base.py index 700cae4..1206b35 100644 --- a/marshmallow_jsonschema/base.py +++ b/marshmallow_jsonschema/base.py @@ -188,8 +188,8 @@ def _from_python_type(self, obj, field, pytype) -> typing.Dict[str, typing.Any]: if field.dump_only: json_schema["readOnly"] = True - if field.default is not missing and not callable(field.default): - json_schema["default"] = field.default + if field.dump_default is not missing and not callable(field.dump_default): + json_schema["default"] = field.dump_default if ALLOW_ENUMS and isinstance(field, EnumField): json_schema["enum"] = self._get_enum_values(field) @@ -325,8 +325,8 @@ def _from_nested_schema(self, obj, field): continue schema[md_key] = md_val - if field.default is not missing and not callable(field.default): - schema["default"] = nested_instance.dump(field.default) + if field.dump_default is not missing and not callable(field.dump_default): + schema["default"] = nested_instance.dump(field.dump_default) if field.many: schema = { From 27115d1ece5194a4beb8350995fcfd78a16d955f Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Fri, 26 Aug 2022 10:30:02 +0200 Subject: [PATCH 2/2] require marshmallow >= 3.13 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7e147e9..9416eb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -marshmallow>=3.11 +marshmallow>=3.13