Merge pull request #1199 from alphagov/flask-marshmallow

re-introduce flask-marshmallow

requirements.txt

@@ -3,6 +3,7 @@ boto3==1.4.6
 celery==3.1.25 # pyup: <4
 docopt==0.6.2
 Flask-Bcrypt==0.6.2
+Flask-Marshmallow==0.8.0
 Flask-Migrate==2.1.0
 Flask-Script==2.0.5
 Flask-SQLAlchemy==2.2

tests/__init__.py

@@ -1,6 +1,8 @@
 import uuid
+
 from flask import current_app
 from notifications_python_client.authentication import create_jwt_token
+
 from app.models import ApiKey, KEY_TYPE_NORMAL
 from app.dao.api_key_dao import save_model_api_key
 from app.dao.services_dao import dao_fetch_service_by_id