From 6030d1d4aa4505f4426f7abd0fd9fa43a87bd8df Mon Sep 17 00:00:00 2001
From: Vit Zikmund <vit.zikmund@themama.ai>
Date: Wed, 6 Mar 2024 20:01:37 +0100
Subject: [PATCH] chore(test): fix marshmallow deprecation warnings

- changing 'missing' to 'load_default'
- removing obsolete marshmallow-enum whose functionality has been since integrated into the main package
---
 giftless/schema.py    | 9 +++++----
 pyproject.toml        | 1 -
 requirements/main.in  | 1 -
 requirements/main.txt | 5 +----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/giftless/schema.py b/giftless/schema.py
index 7012ae0..5f40506 100644
--- a/giftless/schema.py
+++ b/giftless/schema.py
@@ -5,7 +5,6 @@
 import marshmallow
 from flask_marshmallow import Marshmallow
 from marshmallow import fields, pre_load, validate
-from marshmallow_enum import EnumField
 
 ma = Marshmallow()
 
@@ -32,7 +31,7 @@ class ObjectSchema(ma.Schema):  # type:ignore[name-defined]
     oid = fields.String(required=True)
     size = fields.Integer(required=True, validate=validate.Range(min=0))
 
-    extra = fields.Dict(required=False, missing=dict)
+    extra = fields.Dict(required=False, load_default=dict)
 
     @pre_load
     def set_extra_fields(
@@ -51,8 +50,10 @@ def set_extra_fields(
 class BatchRequest(ma.Schema):  # type:ignore[name-defined]
     """batch request schema."""
 
-    operation = EnumField(Operation, required=True)
-    transfers = fields.List(fields.String, required=False, missing=["basic"])
+    operation = fields.Enum(Operation, required=True)
+    transfers = fields.List(
+        fields.String, required=False, load_default=["basic"]
+    )
     ref = fields.Nested(RefSchema, required=False)
     objects = fields.Nested(
         ObjectSchema, validate=validate.Length(min=1), many=True, required=True
diff --git a/pyproject.toml b/pyproject.toml
index 8254fa7..ad08f26 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,6 @@ warn_unused_ignores = true
 [[tool.mypy.overrides]]
 module = [
     "flask_classful",
-    "marshmallow_enum",
     "webargs"
 ]
 ignore_missing_imports = true
diff --git a/requirements/main.in b/requirements/main.in
index 4bb81e0..20dbb4e 100644
--- a/requirements/main.in
+++ b/requirements/main.in
@@ -1,7 +1,6 @@
 figcan==0.0.*
 flask~=2.3
 flask-marshmallow~=0.15
-marshmallow-enum~=1.5
 pyyaml~=6.0
 PyJWT~=2.4
 webargs~=8.3
diff --git a/requirements/main.txt b/requirements/main.txt
index 102ce92..f1bbd97 100644
--- a/requirements/main.txt
+++ b/requirements/main.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/main.txt requirements/main.in
@@ -91,10 +91,7 @@ markupsafe==2.1.3
 marshmallow==3.20.2
     # via
     #   flask-marshmallow
-    #   marshmallow-enum
     #   webargs
-marshmallow-enum==1.5.1
-    # via -r requirements/main.in
 packaging==23.2
     # via
     #   flask-marshmallow