Merge pull request #36 from mike-oakley/u/mike/maintenance

chore: Update dependencies to resolve security advisories.

Author: mike-oakley

openapi_pydantic/v3/v3_0_3/schema.py

@@ -605,8 +605,7 @@ def schema_validate(
         strict: Optional[bool] = None,
         from_attributes: Optional[bool] = None,
         context: Optional[Dict[str, Any]] = None
-    ) -> Schema:
-        ...
+    ) -> Schema: ...
 
 elif PYDANTIC_V2:
     schema_validate = Schema.model_validate

openapi_pydantic/v3/v3_0_3/util.py

@@ -58,8 +58,7 @@ def get_mode(
 
 if TYPE_CHECKING:
 
-    class GenerateOpenAPI30Schema:
-        ...
+    class GenerateOpenAPI30Schema: ...
 
 elif PYDANTIC_V2:
     from enum import Enum
@@ -111,8 +110,7 @@ def literal_schema(self, schema: core_schema.LiteralSchema) -> JsonSchemaValue:
 
 else:
 
-    class GenerateOpenAPI30Schema:
-        ...
+    class GenerateOpenAPI30Schema: ...
 
 
 def construct_open_api_with_schema_class(

openapi_pydantic/v3/v3_1_0/schema.py

@@ -962,8 +962,7 @@ def schema_validate(
         strict: Optional[bool] = None,
         from_attributes: Optional[bool] = None,
         context: Optional[Dict[str, Any]] = None
-    ) -> Schema:
-        ...
+    ) -> Schema: ...
 
 elif PYDANTIC_V2:
     schema_validate = Schema.model_validate

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-pydantic"
-version = "0.4.0"
+version = "0.4.1"
 description = "Pydantic OpenAPI schema implementation"
 authors = ["Mike Oakley <[email protected]>"]
 readme = "README.md"
@@ -26,15 +26,15 @@ python = "^3.8"
 pydantic = ">=1.8"
 
 [tool.poetry.group.test.dependencies]
-pytest = "^7.3.0"
-pytest-cov = "^4.0.0"
+pytest = "^8.2.2"
+pytest-cov = "^5.0.0"
 openapi-spec-validator = "^0.7.0"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.12.1"
+black = "^24.4.2"
 mypy = "^1.8.0"
 pre-commit = "^2.16.0"
-ruff = "^0.1.9"
+ruff = "^0.4.8"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -63,8 +63,7 @@ def construct_sample_api() -> OpenAPI:
 
     if TYPE_CHECKING:
 
-        def computed_field(x: Callable) -> Callable:
-            ...
+        def computed_field(x: Callable) -> Callable: ...
 
     else:
         from pydantic import computed_field

tests/util/test_optional_and_computed.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Union
+from typing import Union
 
 from pydantic import BaseModel, Field
 from typing_extensions import Literal
@@ -59,17 +59,16 @@ def construct_base_open_api() -> OpenAPI:
 def test_pydantic_discriminator_schema_generation() -> None:
     """https://github.com/kuimono/openapi-schema-pydantic/issues/8"""
 
-    a_kind: Dict[str, Any]
-    b_kind: Dict[str, Any]
+    a_kind = {"const": "a", "enum": ["a"], "title": "Kind", "type": "string"}
+    b_kind = {"const": "b", "enum": ["b"], "title": "Kind", "type": "string"}
 
     if PYDANTIC_V2:
         _key_map, json_schema = models_json_schema([(RequestModel, "validation")])
-        a_kind = {"const": "a", "title": "Kind"}
-        b_kind = {"const": "b", "title": "Kind"}
     else:
         json_schema = v1_schema([RequestModel])
-        a_kind = {"enum": ["a"], "title": "Kind", "type": "string"}
-        b_kind = {"enum": ["b"], "title": "Kind", "type": "string"}
+        a_kind.pop("const")
+        b_kind.pop("const")
+
     assert json_schema == {
         DEFS_KEY: {
             "DataAModel": {

tests/util/test_pydantic_field.py

@@ -66,8 +66,7 @@ def construct_sample_api() -> OpenAPI:
 
     if TYPE_CHECKING:
 
-        def computed_field(x: Callable) -> Callable:
-            ...
+        def computed_field(x: Callable) -> Callable: ...
 
     else:
         from pydantic import computed_field