Compatibility with apispec v1.0.0b3

Author: DStape

.travis.yml

@@ -2,7 +2,7 @@ language: python
 cache: pip
 sudo: false
 env:
-- APISPEC_VERSION="==0.39.0"
+- APISPEC_VERSION="==1.0.0b3"
 - APISPEC_VERSION=""
 - MARSHMALLOW_VERSION="==2.13.0"
 - MARSHMALLOW_VERSION=""

flask_apispec/extension.py

@@ -21,6 +21,7 @@ class FlaskApiSpec(object):
             'APISPEC_SPEC': APISpec(
                 title='pets',
                 version='v1',
+                openapi_version='2.0',
                 plugins=[MarshmallowPlugin()],
             ),
             'APISPEC_SWAGGER_URL': '/swagger/',
@@ -51,7 +52,8 @@ def init_app(self, app):
         self.app = app
         self.spec = self.app.config.get('APISPEC_SPEC') or \
                     make_apispec(self.app.config.get('APISPEC_TITLE', 'flask-apispec'),
-                                 self.app.config.get('APISPEC_VERSION', 'v1'))
+                                 self.app.config.get('APISPEC_VERSION', 'v1'),
+                                 self.app.config.get('APISPEC_OAS_VERSION', '2.0'))
         self.add_swagger_routes()
         self.resource_converter = ResourceConverter(self.app, spec=self.spec)
         self.view_converter = ViewConverter(app=self.app, spec=self.spec)
@@ -146,9 +148,10 @@ def _register(self, target, endpoint=None, blueprint=None,
             self.spec.add_path(**path)
 
 
-def make_apispec(title='flask-apispec', version='v1'):
+def make_apispec(title='flask-apispec', version='v1', openapi_version='2.0'):
     return APISpec(
         title=title,
         version=version,
+        openapi_version=openapi_version,
         plugins=[MarshmallowPlugin()],
     )

setup.py

@@ -9,7 +9,7 @@
     'flask>=0.10.1',
     'marshmallow>=2.0.0',
     'webargs>=0.18.0',
-    'apispec>=0.17.0,<1.0.0b1',
+    'apispec==1.0.0b3',
 ]
 
 def find_version(fname):

tests/test_extension.py

@@ -92,9 +92,9 @@ def test_serve_swagger_ui_custom_url(self, app, client):
     def test_apispec_config(self, app):
         app.config['APISPEC_TITLE'] = 'test-extension'
         app.config['APISPEC_VERSION'] = '2.1'
+        app.config['APISPEC_OAS_VERSION'] = '2.0'
         docs = FlaskApiSpec(app)
 
-        assert docs.spec.info == {
-            'title': 'test-extension',
-            'version': '2.1',
-        }
+        assert docs.spec.title == 'test-extension'
+        assert docs.spec.version == '2.1'
+        assert docs.spec.openapi_version == '2.0'

tests/test_openapi.py

@@ -20,6 +20,7 @@ def spec(marshmallow_plugin):
     return APISpec(
         title='title',
         version='v1',
+        openapi_version='2.0',
         plugins=[marshmallow_plugin],
     )
 
@@ -32,6 +33,7 @@ def test_error_if_spec_does_not_have_marshmallow_plugin(app):
     bad_spec = APISpec(
         title='title',
         version='v1',
+        openapi_version='2.0',
         plugins=[],  # oh no! no MarshmallowPlugin
     )
     with pytest.raises(RuntimeError):