Merge pull request #205 from v-francoise/bug/support-new-apispec

Update imports to support apispec>=0.39.0
flasgger · Jul 30, 2018 · 622ac1e · 622ac1e
2 parents 6bdacba + 370e67c
commit 622ac1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/flasgger/marshmallow_apispec.py b/flasgger/marshmallow_apispec.py
@@ -7,10 +7,12 @@
 
 try:
     from marshmallow import Schema, fields
-    from apispec.ext.marshmallow.swagger import (
-        schema2jsonschema, schema2parameters
-    )
+    from apispec.ext.marshmallow import openapi
     from apispec import APISpec as BaseAPISpec
+
+    openapi_converter = openapi.OpenAPIConverter(openapi_version='2.0')
+    schema2jsonschema = openapi_converter.schema2jsonschema
+    schema2parameters = openapi_converter.schema2parameters
 except ImportError:
     Schema = None
     fields = None

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,6 @@
 # optional (for dev)
 marshmallow
-apispec
+apispec>=0.39.0
 flask-restful
 pep8==1.5.7
 flake8==2.4.1
@@ -13,4 +13,4 @@ wheel
 flask-jwt
 
 # install flasgger itself as editable
--e .
+-e .