Unpin marshmallow library (#440)

functools.partial is not supported by mypy, so the lines that
call the partial functions need have the 'type:ignore' comment.

python/mypy#1484

Author: ajmaddaford

Pipfile

@@ -52,7 +52,7 @@ blinker = "*"
 "boto3" = "*"
 humanize = "*"
 flask-talisman = "*"
-marshmallow = "==3.0.0rc6"
+marshmallow = "*"
 python-snappy = "*"
 google-cloud-storage = "*"
 jsonpointer = "*"

Pipfile.lock

@@ -47,7 +47,7 @@ class DateTimeSchemaMixin:
     updated_at = fields.DateTime()
 
     @pre_dump
-    def set_date(self, data):
+    def set_date(self, data, **kwargs):
         data.updated_at = datetime.now(tz=tzutc())
         return data
 
@@ -58,7 +58,7 @@ class QuestionnaireStateSchema(Schema, DateTimeSchemaMixin):
     version = fields.Integer()
 
     @post_load
-    def make_model(self, data):
+    def make_model(self, data, **kwargs):
         created_at = data.pop("created_at", None)
         updated_at = data.pop("updated_at", None)
         model = QuestionnaireState(**data)
@@ -74,7 +74,7 @@ class EQSessionSchema(Schema, DateTimeSchemaMixin):
     expires_at = Timestamp()
 
     @post_load
-    def make_model(self, data):
+    def make_model(self, data, **kwargs):
         created_at = data.pop("created_at", None)
         updated_at = data.pop("updated_at", None)
         model = EQSession(**data)
@@ -88,5 +88,5 @@ class UsedJtiClaimSchema(Schema):
     expires_at = Timestamp()
 
     @post_load
-    def make_model(self, data):
+    def make_model(self, data, **kwargs):
         return UsedJtiClaim(**data)

app/data_models/app_models.py

@@ -57,8 +57,8 @@ def _deserialize(self, *args, **kwargs):  # pylint: disable=arguments-differ
 
 
 class StripWhitespaceMixin:
-    @pre_load
-    def strip_whitespace(self, items):  # pylint: disable=no-self-use
+    @pre_load()
+    def strip_whitespace(self, items, **kwargs):  # pylint: disable=no-self-use
         for key, value in items.items():
             if isinstance(value, str):
                 items[key] = value.strip()
@@ -68,33 +68,41 @@ def strip_whitespace(self, items):  # pylint: disable=no-self-use
 class RunnerMetadataSchema(Schema, StripWhitespaceMixin):
     """Metadata which is required for the operation of runner itself"""
 
-    jti = VALIDATORS["uuid"]()
-    ru_ref = VALIDATORS["string"](validate=validate.Length(min=1))
-    collection_exercise_sid = VALIDATORS["string"](validate=validate.Length(min=1))
-    tx_id = VALIDATORS["uuid"]()
-    questionnaire_id = VALIDATORS["string"](validate=validate.Length(min=1))
-    response_id = VALIDATORS["string"](validate=validate.Length(min=1))
-
-    account_service_url = VALIDATORS["url"](required=False)
-    case_id = VALIDATORS["uuid"](required=False)
-    account_service_log_out_url = VALIDATORS["url"](required=False)
+    jti = VALIDATORS["uuid"]()  # type:ignore
+    ru_ref = VALIDATORS["string"](validate=validate.Length(min=1))  # type:ignore
+    collection_exercise_sid = VALIDATORS["string"](
+        validate=validate.Length(min=1)
+    )  # type:ignore
+    tx_id = VALIDATORS["uuid"]()  # type:ignore
+    questionnaire_id = VALIDATORS["string"](
+        validate=validate.Length(min=1)
+    )  # type:ignore
+    response_id = VALIDATORS["string"](validate=validate.Length(min=1))  # type:ignore
+
+    account_service_url = VALIDATORS["url"](required=False)  # type:ignore
+    case_id = VALIDATORS["uuid"](required=False)  # type:ignore
+    account_service_log_out_url = VALIDATORS["url"](required=False)  # type:ignore
     roles = fields.List(fields.String(), required=False)
-    survey_url = VALIDATORS["url"](required=False)
-    language_code = VALIDATORS["string"](required=False)
-    channel = VALIDATORS["string"](required=False, validate=validate.Length(min=1))
-    case_type = VALIDATORS["string"](required=False)
+    survey_url = VALIDATORS["url"](required=False)  # type:ignore
+    language_code = VALIDATORS["string"](required=False)  # type:ignore
+    channel = VALIDATORS["string"](
+        required=False, validate=validate.Length(min=1)
+    )  # type:ignore
+    case_type = VALIDATORS["string"](required=False)  # type:ignore
 
     # Either schema_name OR the three census parameters are required. Should be required after census.
-    schema_name = VALIDATORS["string"](required=False)
+    schema_name = VALIDATORS["string"](required=False)  # type:ignore
 
     # The following three parameters can be removed after Census
     survey = VALIDATORS["string"](
         required=False, validate=validate.OneOf(("CENSUS", "CCS")), missing="CENSUS"
-    )
+    )  # type:ignore
     form_type = VALIDATORS["string"](
         required=False, validate=validate.OneOf(("H", "I", "C"))
-    )
-    region_code = VALIDATORS["string"](required=False, validate=RegionCode())
+    )  # type:ignore
+    region_code = VALIDATORS["string"](
+        required=False, validate=RegionCode()
+    )  # type:ignore
 
     @validates_schema
     def validate_schema_name(self, data, **kwargs):