🌐 AI搜索 & 代理 主页
Skip to content

Commit 4005f78

Browse files
nezharnezhar
committed
#296: Adds support for OpenAPI 3.1
1 parent 51fa9cd commit 4005f78

28 files changed

+454
-65
lines changed

‎.github/workflows/python-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/setup-python@v2
2424
with:
2525
python-version: ${{ matrix.python-version }}
26-
26+
2727
- name: Get full Python version
2828
id: full-python-version
2929
run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ nosetests.xml
4646
coverage.xml
4747
*.cover
4848
.hypothesis/
49+
tests/**/reports
4950

5051
# Translations
5152
*.mo
@@ -104,4 +105,4 @@ ENV/
104105
# Jetbrains project files
105106
.idea/
106107

107-
/reports/
108+
/reports/

‎openapi_core/spec/shortcuts.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ def create_spec(
1111
spec_dict,
1212
spec_url="",
1313
handlers=default_handlers,
14+
spec_validator=openapi_v3_spec_validator,
1415
validate_spec=True,
1516
):
1617
if validate_spec:
17-
openapi_v3_spec_validator.validate(spec_dict, spec_url=spec_url)
18+
spec_validator.validate(spec_dict, spec_url=spec_url)
1819

1920
spec_resolver = RefResolver(spec_url, spec_dict, handlers=handlers)
2021
dereferencer = Dereferencer(spec_resolver)

‎poetry.lock‎

Lines changed: 31 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ flask = {version = "*", optional = true}
4141
isodate = "*"
4242
more-itertools = "*"
4343
parse = "*"
44-
openapi-schema-validator = "^0.2.0"
45-
openapi-spec-validator = "^0.4.0"
44+
openapi-schema-validator = {version = "0.3.0a1", allow-prereleases = true}
45+
openapi-spec-validator = {version = "0.5.0a1", allow-prereleases = true}
4646
requests = {version = "*", optional = true}
4747
werkzeug = "*"
4848

‎tests/integration/contrib/django/data/v3.0/djangoproject/settings.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from pathlib import Path
1515

1616
import yaml
17+
from openapi_spec_validator import openapi_v30_spec_validator
1718

1819
from openapi_core import create_spec
1920

@@ -123,4 +124,6 @@
123124

124125
OPENAPI_SPEC_DICT = yaml.load(OPENAPI_SPEC_PATH.read_text(), yaml.Loader)
125126

126-
OPENAPI_SPEC = create_spec(OPENAPI_SPEC_DICT)
127+
OPENAPI_SPEC = create_spec(
128+
OPENAPI_SPEC_DICT, spec_validator=openapi_v30_spec_validator
129+
)

‎tests/integration/contrib/falcon/data/v3.0/falconproject/openapi.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from pathlib import Path
22

33
import yaml
4+
from openapi_spec_validator import openapi_v30_spec_validator
45

56
from openapi_core import create_spec
67
from openapi_core.contrib.falcon.middlewares import FalconOpenAPIMiddleware
78

89
openapi_spec_path = Path("tests/integration/data/v3.0/petstore.yaml")
910
spec_dict = yaml.load(openapi_spec_path.read_text(), yaml.Loader)
10-
spec = create_spec(spec_dict)
11+
spec = create_spec(spec_dict, spec_validator=openapi_v30_spec_validator)
1112
openapi_middleware = FalconOpenAPIMiddleware.from_spec(spec)

‎tests/integration/contrib/flask/test_flask_decorator.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from flask import Flask
33
from flask import jsonify
44
from flask import make_response
5+
from openapi_spec_validator import openapi_v30_spec_validator
56

67
from openapi_core.contrib.flask.decorators import FlaskOpenAPIViewDecorator
78
from openapi_core.shortcuts import create_spec
@@ -15,7 +16,10 @@ class TestFlaskOpenAPIDecorator:
1516
@pytest.fixture
1617
def spec(self, factory):
1718
specfile = "contrib/flask/data/v3.0/flask_factory.yaml"
18-
return create_spec(factory.spec_from_file(specfile))
19+
return create_spec(
20+
factory.spec_from_file(specfile),
21+
spec_validator=openapi_v30_spec_validator,
22+
)
1923

2024
@pytest.fixture
2125
def decorator(self, spec):

‎tests/integration/contrib/flask/test_flask_validation.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import pytest
2+
from openapi_spec_validator import openapi_v30_spec_validator
23

34
from openapi_core.contrib.flask import FlaskOpenAPIRequest
45
from openapi_core.contrib.flask import FlaskOpenAPIResponse
@@ -11,7 +12,10 @@ class TestFlaskOpenAPIValidation:
1112
@pytest.fixture
1213
def flask_spec(self, factory):
1314
specfile = "contrib/flask/data/v3.0/flask_factory.yaml"
14-
return create_spec(factory.spec_from_file(specfile))
15+
return create_spec(
16+
factory.spec_from_file(specfile),
17+
spec_validator=openapi_v30_spec_validator,
18+
)
1519

1620
def test_response_validator_path_pattern(
1721
self, flask_spec, request_factory, response_factory

‎tests/integration/contrib/flask/test_flask_views.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from flask import Flask
33
from flask import jsonify
44
from flask import make_response
5+
from openapi_spec_validator import openapi_v30_spec_validator
56

67
from openapi_core.contrib.flask.views import FlaskOpenAPIView
78
from openapi_core.shortcuts import create_spec
@@ -14,7 +15,10 @@ class TestFlaskOpenAPIView:
1415
@pytest.fixture
1516
def spec(self, factory):
1617
specfile = "contrib/flask/data/v3.0/flask_factory.yaml"
17-
return create_spec(factory.spec_from_file(specfile))
18+
return create_spec(
19+
factory.spec_from_file(specfile),
20+
spec_validator=openapi_v30_spec_validator,
21+
)
1822

1923
@pytest.fixture
2024
def app(self):

0 commit comments

Comments
 (0)