From 0de207804367888f96bcbee0f0a6c8df68837b58 Mon Sep 17 00:00:00 2001 From: p1c2u Date: Fri, 2 Sep 2022 14:28:58 +0100 Subject: [PATCH 1/6] pin openapi dependencies --- requirements.txt | 5 +++-- requirements_2.7.txt | 4 ++-- requirements_dev.txt | 3 ++- setup.cfg | 8 +++++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index b2d723d3..322baa96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,8 @@ 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 +PyYAML==5.3.1 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..11310fde 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,8 +28,9 @@ setup_requires = install_requires = isodate dictpath - openapi-spec-validator - openapi-schema-validator + openapi-spec-validator < 0.4.0 + openapi-schema-validator < 0.2.0 + PyYAML < 6.0; python_version>="3.6" six lazy-object-proxy attrs @@ -41,8 +42,9 @@ install_requires = tests_require = mock; python_version<"3.0" pytest - pytest-flake8 + pytest-flake8 < 1.1.0 pytest-cov + flake8 < 4.0.0 falcon flask responses From 50d191a179682278ca2399e0433eae5859148c92 Mon Sep 17 00:00:00 2001 From: p1c2u Date: Fri, 2 Sep 2022 15:41:59 +0100 Subject: [PATCH 2/6] Version 0.14.3 --- .bumpversion.cfg | 2 +- openapi_core/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 52d2ba71..bed6dbd1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.14.2 +current_version = 0.14.3 tag = True tag_name = {new_version} commit = True diff --git a/openapi_core/__init__.py b/openapi_core/__init__.py index 8d2eb35a..dd17f4a1 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.3' __url__ = 'https://github.com/p1c2u/openapi-core' __license__ = 'BSD 3-Clause License' From d8e3cdaec299cf832dc9d65a283773394c55ea26 Mon Sep 17 00:00:00 2001 From: p1c2u Date: Fri, 2 Sep 2022 17:12:20 +0100 Subject: [PATCH 3/6] pyyaml strict requirement fix --- requirements.txt | 1 - setup.cfg | 1 - .../contrib/django/data/djangoproject/testapp/views.py | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 322baa96..09253b3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ isodate==0.6.0 dictpath==0.1.3 openapi-spec-validator==0.3.3 openapi-schema-validator==0.1.6 -PyYAML==5.3.1 six lazy-object-proxy attrs diff --git a/setup.cfg b/setup.cfg index 11310fde..8a5f1b41 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,6 @@ install_requires = dictpath openapi-spec-validator < 0.4.0 openapi-schema-validator < 0.2.0 - PyYAML < 6.0; python_version>="3.6" six lazy-object-proxy attrs 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) From c36897807a1d43e2cf54d329ba3a4ede5c968920 Mon Sep 17 00:00:00 2001 From: p1c2u Date: Fri, 2 Sep 2022 17:24:07 +0100 Subject: [PATCH 4/6] Version 0.14.4 --- .bumpversion.cfg | 2 +- openapi_core/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bed6dbd1..90159894 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.14.3 +current_version = 0.14.4 tag = True tag_name = {new_version} commit = True diff --git a/openapi_core/__init__.py b/openapi_core/__init__.py index dd17f4a1..4a907ecb 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.3' +__version__ = '0.14.4' __url__ = 'https://github.com/p1c2u/openapi-core' __license__ = 'BSD 3-Clause License' From e098725e0e0168a7f90199a22c985169fce9bbb7 Mon Sep 17 00:00:00 2001 From: p1c2u Date: Fri, 2 Sep 2022 18:15:12 +0100 Subject: [PATCH 5/6] openapi-spec-validator strict requirement fix --- .github/workflows/python-test.yml | 7 +++---- setup.cfg | 31 ++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 15 deletions(-) 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/setup.cfg b/setup.cfg index 8a5f1b41..3b4a559b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,8 +28,8 @@ setup_requires = install_requires = isodate dictpath - openapi-spec-validator < 0.4.0 - openapi-schema-validator < 0.2.0 + openapi-spec-validator < 0.5.0 + openapi-schema-validator < 0.3.0 six lazy-object-proxy attrs @@ -39,15 +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 < 1.1.0 - pytest-cov - flake8 < 4.0.0 + 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 = @@ -55,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 From cd035e73d8e29ca053b92f07b879551a53fdbdf6 Mon Sep 17 00:00:00 2001 From: p1c2u Date: Fri, 2 Sep 2022 21:02:48 +0100 Subject: [PATCH 6/6] Version 0.14.5 --- .bumpversion.cfg | 2 +- openapi_core/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 90159894..e8080a9f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.14.4 +current_version = 0.14.5 tag = True tag_name = {new_version} commit = True diff --git a/openapi_core/__init__.py b/openapi_core/__init__.py index 4a907ecb..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.4' +__version__ = '0.14.5' __url__ = 'https://github.com/p1c2u/openapi-core' __license__ = 'BSD 3-Clause License'