✨ Upgrade apispec version to 4.0+

vortico · Nov 16, 2020 · 4aa46e8 · 4aa46e8
1 parent 6696970
commit 4aa46e8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/flama/schemas.py b/flama/schemas.py
@@ -145,7 +145,7 @@ def get_endpoints(
 
     def _add_endpoint_parameters(self, endpoint: EndpointInfo, schema: typing.Dict):
         schema["parameters"] = [
-            self.converter.field2parameter(field.schema, name=field.name, default_in=field.location.name)
+            self.converter._field2parameter(field.schema, name=field.name, location=field.location.name)
             for field in itertools.chain(endpoint.query_fields.values(), endpoint.path_fields.values())
         ]
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ python = "^3.6"
 starlette = ">=0.14.0,<1.0.0"
 marshmallow = "^3.0"
 python-forge = {version = "^18.6",optional = true}
-apispec = {version = "^3.0",optional = true}
+apispec = {version = "^4.0",optional = true}
 pyyaml = {version = "^5.0",optional = true}
 databases = {version = "^0.4.0",optional = true}
 
@@ -41,7 +41,7 @@ ipdb = "^0.11"
 isort = "^4.3"
 python-multipart = "^0.0.5"
 pyyaml = "^5.0"
-apispec = "^3.0"
+apispec = "^4.0"
 flake8 = "^3.7"
 pytest-asyncio = "^0.10"
 sqlalchemy-utils = "^0.33"

diff --git a/tests/test_pagination.py b/tests/test_pagination.py
@@ -42,13 +42,13 @@ def test_pagination_schema_parameters(self, app):
                 "name": "page",
                 "in": "query",
                 "required": False,
-                "schema": {"default": None, "type": "integer", "format": "int32", "nullable": True},
+                "schema": {"default": None, "type": "integer", "nullable": True},
             },
             {
                 "name": "page_size",
                 "in": "query",
                 "required": False,
-                "schema": {"default": None, "type": "integer", "format": "int32", "nullable": True},
+                "schema": {"default": None, "type": "integer", "nullable": True},
             },
             {"name": "count", "in": "query", "required": False, "schema": {"type": "boolean", "default": True}},
         ]
@@ -157,13 +157,13 @@ def test_pagination_schema_parameters(self, app):
                 "name": "limit",
                 "in": "query",
                 "required": False,
-                "schema": {"default": None, "type": "integer", "format": "int32", "nullable": True},
+                "schema": {"default": None, "type": "integer", "nullable": True},
             },
             {
                 "name": "offset",
                 "in": "query",
                 "required": False,
-                "schema": {"default": None, "type": "integer", "format": "int32", "nullable": True},
+                "schema": {"default": None, "type": "integer", "nullable": True},
             },
             {"name": "count", "in": "query", "required": False, "schema": {"type": "boolean", "default": True}},
         ]

diff --git a/tests/test_schemas.py b/tests/test_schemas.py
@@ -140,9 +140,7 @@ def test_schema_path_params(self, app):
 
         assert schema["description"] == "Path param."
         assert response == {"description": "Param."}
-        assert parameters == [
-            {"name": "param", "in": "path", "required": True, "schema": {"type": "integer", "format": "int32"}}
-        ]
+        assert parameters == [{"name": "param", "in": "path", "required": True, "schema": {"type": "integer"}}]
 
     def test_schema_body_params(self, app):
         schema = app.schema["paths"]["/body-param/"]["post"]