Merge pull request #172 from TMiguelT/python3

Python 3 and Marshmallow 3

Author: akira-dev

.travis.yml

@@ -1,17 +1,12 @@
-dist: trusty
+dist: xenial
 language: python
 python:
-  - '2.7'
-  - '3.4'
   - '3.5'
-  - 'pypy'
-install:
-  - pip install -r requirements.txt
-  - pip install coveralls coverage
-  - pip install -U setuptools
-  - pip install pytest --upgrade
+  - '3.6'
+  - '3.7'
+  - 'pypy3'
 script:
-  - python setup.py install
+  - pip install .[dev]
   - coverage run --source flask_rest_jsonapi -m pytest -v
 after_success:
   - coveralls

flask_rest_jsonapi/resource.py

@@ -128,7 +128,7 @@ def get(self, *args, **kwargs):
                                 qs,
                                 qs.include)
 
-        result = schema.dump(objects).data
+        result = schema.dump(objects)
 
         view_kwargs = request.view_args if getattr(self, 'view_kwargs', None) is True else dict()
         add_pagination_links(result,
@@ -157,7 +157,7 @@ def post(self, *args, **kwargs):
                                 qs.include)
 
         try:
-            data, errors = schema.load(json_data)
+            data = schema.load(json_data)
         except IncorrectTypeError as e:
             errors = e.messages
             for error in errors['errors']:
@@ -171,17 +171,11 @@ def post(self, *args, **kwargs):
                 message['title'] = "Validation error"
             return errors, 422
 
-        if errors:
-            for error in errors['errors']:
-                error['status'] = "422"
-                error['title'] = "Validation error"
-            return errors, 422
-
         self.before_post(args, kwargs, data=data)
 
         obj = self.create_object(data, kwargs)
 
-        result = schema.dump(obj).data
+        result = schema.dump(obj)
 
         if result['data'].get('links', {}).get('self'):
             final_result = (result, 201, {'Location': result['data']['links']['self']})
@@ -237,7 +231,7 @@ def get(self, *args, **kwargs):
                                 qs,
                                 qs.include)
 
-        result = schema.dump(obj).data
+        result = schema.dump(obj)
 
         final_result = self.after_get(result)
 
@@ -260,7 +254,7 @@ def patch(self, *args, **kwargs):
                                 qs.include)
 
         try:
-            data, errors = schema.load(json_data)
+            data = schema.load(json_data)
         except IncorrectTypeError as e:
             errors = e.messages
             for error in errors['errors']:
@@ -274,12 +268,6 @@ def patch(self, *args, **kwargs):
                 message['title'] = "Validation error"
             return errors, 422
 
-        if errors:
-            for error in errors['errors']:
-                error['status'] = "422"
-                error['title'] = "Validation error"
-            return errors, 422
-
         if 'id' not in json_data['data']:
             raise BadRequest('Missing id in "data" node',
                              source={'pointer': '/data/id'})
@@ -291,7 +279,7 @@ def patch(self, *args, **kwargs):
 
         obj = self.update_object(data, qs, kwargs)
 
-        result = schema.dump(obj).data
+        result = schema.dump(obj)
 
         final_result = self.after_patch(result)
 
@@ -375,7 +363,7 @@ def get(self, *args, **kwargs):
             schema = compute_schema(self.schema, dict(), qs, qs.include)
 
             serialized_obj = schema.dump(obj)
-            result['included'] = serialized_obj.data.get('included', dict())
+            result['included'] = serialized_obj.get('included', dict())
 
         final_result = self.after_get(result)
 

requirements.txt

@@ -1,9 +1,7 @@
 from setuptools import setup, find_packages
 
-
 __version__ = '0.30.1'
 
-
 setup(
     name="Flask-REST-JSONAPI",
     version=__version__,
@@ -15,23 +13,31 @@
     license='MIT',
     classifiers=[
         'Framework :: Flask',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'License :: OSI Approved :: MIT License',
     ],
     keywords='web api rest jsonapi flask sqlalchemy marshmallow',
     packages=find_packages(exclude=['tests']),
     zip_safe=False,
     platforms='any',
-    install_requires=['six',
-                      'Flask>=0.11',
-                      'marshmallow==2.18.0',
-                      'marshmallow_jsonapi',
-                      'sqlalchemy'],
+    install_requires=[
+        'six',
+        'Flask>=0.11',
+        'marshmallow>=3.1.0',
+        'marshmallow_jsonapi>=0.11.0',
+        'sqlalchemy'
+    ],
     setup_requires=['pytest-runner'],
     tests_require=['pytest'],
-    extras_require={'tests': 'pytest', 'docs': 'sphinx'}
+    extras_require={
+        'dev': [
+            'pytest',
+            'coveralls',
+            'coverage'
+        ],
+        'docs': 'sphinx'
+    }
 )