From 9b59a1d29a50510ee1cce3ec705a091fa23d3eaa Mon Sep 17 00:00:00 2001 From: Filippo Ledda Date: Tue, 16 Jan 2024 17:02:51 +0100 Subject: [PATCH] CH-109 more libraries updates --- applications/common/server/requirements.txt | 12 ++------ applications/samples/backend/requirements.txt | 10 ++----- .../samples/backend/samples/encoder.py | 3 +- .../volumemanager/deploy/values-test.yaml | 14 +++++++++ applications/volumemanager/deploy/values.yaml | 6 ++++ .../volumemanager/server/requirements.txt | 10 ++----- .../workflows/server/requirements.txt | 12 ++------ .../cloudharness-flask/requirements.txt | 29 ++++++++----------- 8 files changed, 44 insertions(+), 52 deletions(-) create mode 100644 applications/volumemanager/deploy/values-test.yaml diff --git a/applications/common/server/requirements.txt b/applications/common/server/requirements.txt index 7d43db78..441a0a06 100644 --- a/applications/common/server/requirements.txt +++ b/applications/common/server/requirements.txt @@ -1,13 +1,7 @@ -connexion[swagger-ui] >= 2.6.0; python_version>="3.6" -# 2.3 is the last version that supports python 3.4-3.5 -connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4" -# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug -# we must peg werkzeug versions below to fix connexion -# https://github.com/zalando/connexion/pull/1044 -werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4" +connexion[swagger-ui]==2.14.2 swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools >= 21.0.0 -Flask == 2.1.1 +Flask >= 2.1.0 flask_sqlalchemy==2.4.4 -sqlalchemy<2.0.0 \ No newline at end of file +sqlalchemy \ No newline at end of file diff --git a/applications/samples/backend/requirements.txt b/applications/samples/backend/requirements.txt index be4c8a3a..25d87879 100644 --- a/applications/samples/backend/requirements.txt +++ b/applications/samples/backend/requirements.txt @@ -1,11 +1,5 @@ -connexion[swagger-ui] >= 2.6.0; python_version>="3.6" -# 2.3 is the last version that supports python 3.4-3.5 -connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4" -# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug -# we must peg werkzeug versions below to fix connexion -# https://github.com/zalando/connexion/pull/1044 -werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4" +connexion[swagger-ui]==2.14.2 swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools >= 21.0.0 -Flask == 2.1.1 +Flask >= 2.1.0 diff --git a/applications/samples/backend/samples/encoder.py b/applications/samples/backend/samples/encoder.py index 89412282..fe2c3b18 100644 --- a/applications/samples/backend/samples/encoder.py +++ b/applications/samples/backend/samples/encoder.py @@ -1,7 +1,8 @@ -from connexion.apps.flask_app import FlaskJSONEncoder + import six from samples.models.base_model_ import Model +from flask.json import FlaskJSONEncoder class JSONEncoder(FlaskJSONEncoder): diff --git a/applications/volumemanager/deploy/values-test.yaml b/applications/volumemanager/deploy/values-test.yaml new file mode 100644 index 00000000..5f5c264c --- /dev/null +++ b/applications/volumemanager/deploy/values-test.yaml @@ -0,0 +1,14 @@ +harness: + accounts: + roles: + - role1 + - role2 + - role3 + users: + - username: volumes@testuser.com + clientRoles: + - role1 + realmRoles: + - administrator + + diff --git a/applications/volumemanager/deploy/values.yaml b/applications/volumemanager/deploy/values.yaml index ec5355ca..0b10b02d 100644 --- a/applications/volumemanager/deploy/values.yaml +++ b/applications/volumemanager/deploy/values.yaml @@ -13,3 +13,9 @@ harness: dependencies: build: - cloudharness-flask + test: + api: + enabled: true + autotest: true + checks: + - all \ No newline at end of file diff --git a/applications/volumemanager/server/requirements.txt b/applications/volumemanager/server/requirements.txt index be4c8a3a..25d87879 100644 --- a/applications/volumemanager/server/requirements.txt +++ b/applications/volumemanager/server/requirements.txt @@ -1,11 +1,5 @@ -connexion[swagger-ui] >= 2.6.0; python_version>="3.6" -# 2.3 is the last version that supports python 3.4-3.5 -connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4" -# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug -# we must peg werkzeug versions below to fix connexion -# https://github.com/zalando/connexion/pull/1044 -werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4" +connexion[swagger-ui]==2.14.2 swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools >= 21.0.0 -Flask == 2.1.1 +Flask >= 2.1.0 diff --git a/applications/workflows/server/requirements.txt b/applications/workflows/server/requirements.txt index be4c8a3a..7c5714ba 100644 --- a/applications/workflows/server/requirements.txt +++ b/applications/workflows/server/requirements.txt @@ -1,11 +1,5 @@ -connexion[swagger-ui] >= 2.6.0; python_version>="3.6" -# 2.3 is the last version that supports python 3.4-3.5 -connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4" -# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug -# we must peg werkzeug versions below to fix connexion -# https://github.com/zalando/connexion/pull/1044 -werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4" -swagger-ui-bundle >= 0.0.2 +connexion[swagger-ui]==2.14.2 +swagger-ui-bundle > 0.0.2 python_dateutil >= 2.6.0 setuptools >= 21.0.0 -Flask == 2.1.1 +Flask >= 2.1.0 diff --git a/infrastructure/common-images/cloudharness-flask/requirements.txt b/infrastructure/common-images/cloudharness-flask/requirements.txt index cb03aa81..519bd654 100644 --- a/infrastructure/common-images/cloudharness-flask/requirements.txt +++ b/infrastructure/common-images/cloudharness-flask/requirements.txt @@ -1,17 +1,12 @@ -connexion==2.6.0 -Flask==1.1.2 -Flask-Cors==3.0.9 -flask-oidc==1.4.0 -Flask-Testing==0.6.1 -gunicorn==20.1.0 -itsdangerous==2.0.1 -Jinja2==3.0.3 -jsonschema<4.0.0 -openapi-spec-validator==0.4.0 -pytest==4.6.11 -pytest-cov==3.0.0 -pytest-randomly==1.2.3 -sentry-sdk==0.14.4 -SQLAlchemy==1.4.32 -swagger-ui-bundle==0.0.8 -Werkzeug==2.0.3 \ No newline at end of file +connexion[swagger-ui]==2.14.2 +Flask>=2.1.0 +Flask-Cors>=4.0.0 +gunicorn>=21.2.0 +itsdangerous>=2.1.2 +Jinja2>=3.1.3 +jsonschema>=4.20.0 +openapi-spec-validator<0.5.0 +sentry-sdk>=0.14.4 +SQLAlchemy>=2.0.0 +swagger-ui-bundle>=0.0.2 +werkzeug<2.3 \ No newline at end of file