Merge pull request #150 from jmcarp/restrict-ma-version

Restrict marshmallow versions based on Python version

Author: sloria

setup.py

@@ -7,7 +7,8 @@
 REQUIRES = [
     'six>=1.9.0',
     'flask>=0.10.1',
-    'marshmallow>=2.0.0',
+    'marshmallow>=2.0.0,<3.0.0rc6; python_version<"3"',
+    'marshmallow>=2.0.0; python_version>="3"',
     'webargs>=0.18.0',
     'apispec>=1.0.0',
 ]

tests/test_views.py

@@ -42,7 +42,7 @@ class ArgSchema(Schema):
             name = fields.Str()
 
             @post_load
-            def make_object(self, data):
+            def make_object(self, data, **kwargs):
                 return User(**data)
 
         @app.route('/', methods=('POST', ))