diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 52d2ba71..e8080a9f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.14.2 +current_version = 0.14.5 tag = True tag_name = {new_version} commit = True diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index 9d22fb30..64db07a4 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -23,10 +23,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_dev.txt - pip install -e . + python -m pip install --upgrade pip setuptools + python -m pip install -r requirements_dev.txt + python -m pip install -e .[django,flask,requests] - name: Test run: python setup.py test - name: Upload coverage diff --git a/openapi_core/__init__.py b/openapi_core/__init__.py index 8d2eb35a..65f10c72 100644 --- a/openapi_core/__init__.py +++ b/openapi_core/__init__.py @@ -6,7 +6,7 @@ __author__ = 'Artur Maciag' __email__ = 'maciag.artur@gmail.com' -__version__ = '0.14.2' +__version__ = '0.14.5' __url__ = 'https://github.com/p1c2u/openapi-core' __license__ = 'BSD 3-Clause License' diff --git a/requirements.txt b/requirements.txt index b2d723d3..09253b3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ isodate==0.6.0 dictpath==0.1.3 -openapi-spec-validator -openapi-schema-validator +openapi-spec-validator==0.3.3 +openapi-schema-validator==0.1.6 six lazy-object-proxy attrs diff --git a/requirements_2.7.txt b/requirements_2.7.txt index f4eb34c3..b10069c5 100644 --- a/requirements_2.7.txt +++ b/requirements_2.7.txt @@ -1,6 +1,6 @@ isodate==0.6.0 -openapi-spec-validator -openapi-schema-validator +openapi-spec-validator==0.3.3 +openapi-schema-validator==0.1.6 six lazy-object-proxy backports.functools-lru-cache diff --git a/requirements_dev.txt b/requirements_dev.txt index e5d462ef..dfb7598a 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,7 +1,8 @@ mock==2.0.0 pytest==3.5.0 -pytest-flake8 +pytest-flake8==1.0.7 pytest-cov==2.5.1 +flake8==3.9.2 falcon==2.0.0; python_version<"3.0" falcon==3.0.0; python_version>="3.0" flask diff --git a/setup.cfg b/setup.cfg index 4936a19d..3b4a559b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,8 +28,8 @@ setup_requires = install_requires = isodate dictpath - openapi-spec-validator - openapi-schema-validator + openapi-spec-validator < 0.5.0 + openapi-schema-validator < 0.3.0 six lazy-object-proxy attrs @@ -39,14 +39,19 @@ install_requires = backports.functools-lru-cache; python_version<"3.0" backports.functools-partialmethod; python_version<"3.0" tests_require = - mock; python_version<"3.0" - pytest - pytest-flake8 - pytest-cov + mock == 2.0.0 + pytest == 3.5.0 + pytest-flake8 == 1.0.7 + pytest-cov == 2.5.1 + coverage == 5.5 + djangorestframework == 3.9.4 + flake8 == 3.9.2 falcon - flask + falcon == 2.0.0; python_version<"3.0" responses + responses < 0.18.0; python_version<"3.0" webob + strict-rfc3339 == 0.7 [options.packages.find] exclude = @@ -54,9 +59,14 @@ exclude = [options.extras_require] django = - django>=2.2; python_version>="3.0" -flask = flask -requests = requests + django < 2.0; python_version<"3.0" + django >= 2.2; python_version>="3.0" +flask = + flask + flask < 2.0.0; python_version<"3.0" +requests = + requests + requests < 2.28.0; python_version<"3.0" [tool:pytest] addopts = -sv --flake8 --junitxml reports/junit.xml --cov openapi_core --cov-report term-missing --cov-report xml:reports/coverage.xml diff --git a/tests/integration/contrib/django/data/djangoproject/testapp/views.py b/tests/integration/contrib/django/data/djangoproject/testapp/views.py index fa8448a6..fd6263ca 100644 --- a/tests/integration/contrib/django/data/djangoproject/testapp/views.py +++ b/tests/integration/contrib/django/data/djangoproject/testapp/views.py @@ -17,7 +17,7 @@ class TestView(APIView): def get(self, request, pk): with open(settings.OPENAPI_SPEC_PATH) as file: spec_yaml = file.read() - spec_dict = yaml.load(spec_yaml) + spec_dict = yaml.load(spec_yaml, yaml.FullLoader) spec = create_spec(spec_dict) openapi_request = DjangoOpenAPIRequest(request)