1.2.0

Author: Goldziher

.pre-commit-config.yaml

@@ -77,7 +77,7 @@ repos:
     hooks:
       - id: flake8-markdown
   - repo: https://github.com/pycqa/pylint
-    rev: "v2.14.5"
+    rev: "v2.15.0"
     hooks:
       - id: pylint
         exclude: "test_*|docs"

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+[v1.2.0]
+
+- update to pydantic `v1.1.0`
+
 [v1.1.0]
 
 - removes `v3_0_3`.

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydantic-openapi-schema"
-version = "1.1.0"
+version = "1.2.0"
 description = "OpenAPI Schema using pydantic. Forked for Starlite-API from 'openapi-schema-pydantic'."
 authors = ["Na'aman Hirschfeld <nhirschfeld@gmail.com>"]
 maintainers = ["Na'aman Hirschfeld <nhirschfeld@gmail.com>", "Peter Schutt <peter.github@proton.me>", "Cody Fincher <cody.fincher@gmail.com>"]

pyproject.toml

@@ -1,7 +1,6 @@
 from typing import Union
 
 from pydantic import BaseModel, Field
-from pydantic.schema import schema
 from typing_extensions import Literal
 
 from pydantic_openapi_schema.utils.utils import (
@@ -22,51 +21,12 @@
 )
 
 
-def test_pydantic_discriminator_schema_generation() -> None:
-    """https://github.com/kuimono/openapi-schema-pydantic/issues/8."""
-
-    json_schema = schema([RequestModel])
-    assert json_schema == {
-        "definitions": {
-            "DataAModel": {
-                "properties": {"kind": {"enum": ["a"], "title": "Kind", "type": "string"}},
-                "required": ["kind"],
-                "title": "DataAModel",
-                "type": "object",
-            },
-            "DataBModel": {
-                "properties": {"kind": {"enum": ["b"], "title": "Kind", "type": "string"}},
-                "required": ["kind"],
-                "title": "DataBModel",
-                "type": "object",
-            },
-            "RequestModel": {
-                "properties": {
-                    "data": {
-                        "anyOf": [{"$ref": "#/definitions/DataAModel"}, {"$ref": "#/definitions/DataBModel"}],
-                        "discriminator": {
-                            "mapping": {"a": "#/definitions/DataAModel", "b": "#/definitions/DataBModel"},
-                            "propertyName": "kind",
-                        },
-                        "title": "Data",
-                    }
-                },
-                "required": ["data"],
-                "title": "RequestModel",
-                "type": "object",
-            },
-        }
-    }
-
-
 def test_pydantic_discriminator_openapi_generation() -> None:
-    """https://github.com/kuimono/openapi-schema-pydantic/issues/8."""
-
     open_api = construct_open_api_with_schema_class(construct_base_open_api())
     json_schema = open_api.components.schemas["RequestModel"]  # type: ignore
     assert json_schema.properties == {
         "data": Schema(
-            anyOf=[
+            oneOf=[
                 Reference(ref="#/components/schemas/DataAModel", summary=None, description=None),
                 Reference(ref="#/components/schemas/DataBModel", summary=None, description=None),
             ],