Merge pull request #3362 from fecgov/feature/update-apispec

Update apispec package to use fecgov's forked repo

requirements.txt

@@ -1,4 +1,5 @@
-apispec==0.19.0
+git+https://github.com/fecgov/apispec.git@dev#egg=apispec
+prance[osv]>=0.11 # use apispec[validation] once we no longer fork apispec
 cfenv==0.5.2
 invoke==0.15.0
 psycopg2==2.7.1
@@ -24,7 +25,7 @@ elasticsearch-dsl==5.4.0
 git+https://github.com/18F/slate.git
 
 # Marshalling
-flask-apispec==0.6.0.post0
+flask-apispec==0.7.0
 marshmallow==2.6.0
 marshmallow-sqlalchemy==0.8.0
 git+https://github.com/jmcarp/marshmallow-pagination@master

tests/test_swagger.py

@@ -1,13 +1,16 @@
 import unittest
-
 from apispec import utils, exceptions
+
+import webservices.rest
+import webservices.schemas  # needed to generate full spec
 from webservices.spec import spec, format_docstring
 
+
 class TestSwagger(unittest.TestCase):
 
     def test_swagger_valid(self):
         try:
-            utils.validate_swagger(spec)
+            utils.validate_spec(spec)
         except exceptions.SwaggerError as error:
             self.fail(str(error))
 

webservices/spec.py

@@ -1,4 +1,6 @@
 from apispec import APISpec
+from apispec.ext.marshmallow import MarshmallowPlugin
+
 
 from webservices import docs
 from webservices import __API_VERSION__
@@ -9,8 +11,6 @@ def format_docstring(docstring):
 
     formatted = []
     lines = docstring.expandtabs().splitlines()
-    indent = min(len(line) - len(line.strip()) for line in lines if line.strip())
-    trimmed = [lines[0].lstrip()] + [line[indent:].rstrip() for line in lines[1:]]
 
     for line in lines:
         if line == '':
@@ -20,13 +20,14 @@ def format_docstring(docstring):
 
     return ' '.join(formatted).strip()
 
+
 spec = APISpec(
     title='OpenFEC',
     version=__API_VERSION__,
     info={'description': format_docstring(docs.API_DESCRIPTION)},
     basePath='/v1',
     produces=['application/json'],
-    plugins=['apispec.ext.marshmallow'],
+    plugins=[MarshmallowPlugin()],
     securityDefinitions={
         'apiKey': {
             'type': 'apiKey',