Skip to content

Commit 43bf9a6

Browse files
authored
Merge pull request #212 from p1c2u/feature/use-openapi-schema-validator-lib
Use openapi-schema-validator library
2 parents 8c1e331 + e817973 commit 43bf9a6

File tree

12 files changed

+15
-335
lines changed

12 files changed

+15
-335
lines changed

README.rst

+1
Original file line numberDiff line numberDiff line change
@@ -324,4 +324,5 @@ You can use RequestsOpenAPIResponse as a Requests response factory:
324324
Related projects
325325
################
326326
* `openapi-spec-validator <https://github.com/p1c2u/openapi-spec-validator>`__
327+
* `openapi-schema-validator <https://github.com/p1c2u/openapi-schema-validator>`__
327328
* `pyramid_openapi3 <https://github.com/niteoweb/pyramid_openapi3>`__

openapi_core/schema_validator/__init__.py

-4
This file was deleted.

openapi_core/schema_validator/_format.py

-135
This file was deleted.

openapi_core/schema_validator/_types.py

-21
This file was deleted.

openapi_core/schema_validator/_validators.py

-87
This file was deleted.

openapi_core/schema_validator/validators.py

-72
This file was deleted.

openapi_core/unmarshalling/schemas/factories.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from copy import deepcopy
22
import warnings
33

4+
from openapi_schema_validator import OAS30Validator, oas30_format_checker
5+
46
from openapi_core.schema.schemas.enums import SchemaType, SchemaFormat
57
from openapi_core.schema.schemas.models import Schema
6-
from openapi_core.schema_validator import OAS30Validator
7-
from openapi_core.schema_validator import oas30_format_checker
88
from openapi_core.unmarshalling.schemas.enums import UnmarshalContext
99
from openapi_core.unmarshalling.schemas.exceptions import (
1010
FormatterNotFoundError,

openapi_core/unmarshalling/schemas/unmarshallers.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
from functools import partial
22
import logging
33

4+
from openapi_schema_validator._types import (
5+
is_array, is_bool, is_integer,
6+
is_object, is_number, is_string,
7+
)
8+
from openapi_schema_validator._format import oas30_format_checker
49
from six import text_type, binary_type
510
from six import iteritems
611

712
from openapi_core.extensions.models.factories import ModelFactory
813
from openapi_core.schema.schemas.enums import SchemaFormat, SchemaType
914
from openapi_core.schema.schemas.models import Schema
1015
from openapi_core.schema.schemas.types import NoValue
11-
from openapi_core.schema_validator._types import (
12-
is_array, is_bool, is_integer,
13-
is_object, is_number, is_string,
14-
)
15-
from openapi_core.schema_validator._format import oas30_format_checker
1616
from openapi_core.unmarshalling.schemas.enums import UnmarshalContext
1717
from openapi_core.unmarshalling.schemas.exceptions import (
1818
UnmarshalError, ValidateError, InvalidSchemaValue,

requirements.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
openapi-spec-validator
2+
openapi-schema-validator
23
six
34
lazy-object-proxy
4-
strict_rfc3339
5-
isodate
65
attrs
76
parse==1.14.0
87
more-itertools>=5.0.0

requirements_2.7.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
openapi-spec-validator
2+
openapi-schema-validator
23
six
34
lazy-object-proxy
45
backports.functools-lru-cache
56
backports.functools-partialmethod
67
enum34
7-
strict_rfc3339
88
attrs
99
more-itertools==5.0.0

setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ setup_requires =
2424
setuptools
2525
install_requires =
2626
openapi-spec-validator
27+
openapi-schema-validator
2728
six
2829
lazy-object-proxy
29-
strict_rfc3339
30-
isodate
3130
attrs
3231
werkzeug
3332
parse

0 commit comments

Comments
 (0)