Skip to content

Commit

Permalink
Merge pull request #17 from maticardenas/update-openapi-spec-validator
Browse files Browse the repository at this point in the history
fix: update openapi-spec-validator and replace deprecated imports
  • Loading branch information
maticardenas committed Feb 29, 2024
2 parents 5d7656b + cad4301 commit 459d0f0
Show file tree
Hide file tree
Showing 4 changed files with 177 additions and 259 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.7.14", "3.8.14" , "3.9.14", "3.10.7", "3.11.2" ]
python-version: [ "3.8.14" , "3.9.14", "3.10.7", "3.11.2" ]
django-version: [ "3.2", "4.0", "4.1" ]
exclude:
# Django v4 dropped 3.7 support
Expand Down
10 changes: 5 additions & 5 deletions openapi_tester/loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import yaml
from django.urls import Resolver404, resolve
from django.utils.functional import cached_property
from openapi_spec_validator import openapi_v2_spec_validator, openapi_v30_spec_validator, openapi_v31_spec_validator
from openapi_spec_validator import OpenAPIV2SpecValidator, OpenAPIV30SpecValidator, OpenAPIV31SpecValidator
from prance.util.resolver import RefResolver
from rest_framework.schemas.generators import BaseSchemaGenerator, EndpointEnumerator
from rest_framework.settings import api_settings
Expand Down Expand Up @@ -108,9 +108,9 @@ def validate_schema(schema: dict):
if result:
major, minor = result[0]
if (major, minor) == ("3", "0"):
validator = openapi_v30_spec_validator
validator = OpenAPIV30SpecValidator(schema=schema)
elif (major, minor) == ("3", "1"):
validator = openapi_v31_spec_validator
validator = OpenAPIV31SpecValidator(schema=schema)
else:
raise UndocumentedSchemaSectionError(
UNDOCUMENTED_SCHEMA_SECTION_ERROR.format(
Expand All @@ -120,8 +120,8 @@ def validate_schema(schema: dict):
else:
raise UndocumentedSchemaSectionError(UNDOCUMENTED_SCHEMA_SECTION_ERROR.format(key=schema["openapi"]))
else:
validator = openapi_v2_spec_validator
validator.validate(schema)
validator = OpenAPIV2SpecValidator(schema=schema)
validator.validate()

def set_schema(self, schema: dict) -> None:
"""
Expand Down
Loading

0 comments on commit 459d0f0

Please sign in to comment.