Merge pull request #6 from nonamenix/marshmallow-3.0.0rc6-support

Marshmallow 3.0.0rc6 support
nonamenix · Jun 7, 2019 · 3ea6fd8 · 3ea6fd8
2 parents 6e585eb + 09d3fda
commit 3ea6fd8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/jam/__init__.py b/jam/__init__.py
@@ -3,7 +3,7 @@
 from dataclasses import dataclass
 
 from marshmallow import fields, post_load
-from marshmallow.schema import SchemaMeta as BaseSchemaMeta, BaseSchema, with_metaclass
+from marshmallow.schema import SchemaMeta as BaseSchemaMeta, BaseSchema
 
 import datetime as dt
 import uuid
@@ -119,7 +119,7 @@ def __new__(mcs, name, bases, attrs):
         return new_class
 
 
-class Schema(with_metaclass(SchemaMeta, BaseSchema)):
+class Schema(BaseSchema, metaclass=SchemaMeta):
     __doc__ = BaseSchema.__doc__
 
     @post_load

diff --git a/project.ini b/project.ini
@@ -1,5 +1,5 @@
 [project]
 url = https://github.com/nonamenix/marshmallow-jam
-version = 1.1.2
+version = 1.2.0
 name = marshmallow-jam
 description = Some extra sweets for marshmallow.
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-marshmallow<=3.0.0rc5<=3.0.0rc4
+marshmallow>=3.0.0rc6