From 3f6f451ac95d91708caa59b2dc4857fdaaac39ec Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 14:09:01 +0100 Subject: [PATCH 01/12] upgrades all repo to pydantic==1.9.0 --- ci/helpers/requirements.txt | 2 +- packages/dask-task-models-library/requirements/_base.txt | 2 +- packages/models-library/requirements/_base.txt | 2 +- packages/service-integration/requirements/_base.txt | 2 +- packages/service-integration/requirements/_tools.txt | 2 +- packages/service-library/requirements/_base.txt | 2 +- packages/service-library/requirements/_fastapi.txt | 2 +- packages/settings-library/requirements/_base.txt | 2 +- packages/simcore-sdk/requirements/_base.txt | 2 +- services/api-server/requirements/_base.txt | 2 +- services/catalog/requirements/_base.txt | 2 +- services/dask-sidecar/requirements/_base.txt | 2 +- services/dask-sidecar/requirements/_packages.txt | 2 +- services/datcore-adapter/requirements/_base.txt | 2 +- services/director-v2/requirements/_base.txt | 2 +- services/director-v2/requirements/_test.txt | 2 +- services/dynamic-sidecar/requirements/_base.txt | 2 +- services/storage/requirements/_base.txt | 2 +- services/web/server/requirements/_base.txt | 2 +- tests/environment-setup/requirements/requirements.txt | 2 +- tests/swarm-deploy/requirements/_test.txt | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ci/helpers/requirements.txt b/ci/helpers/requirements.txt index ec07c16d692..dfd6466d920 100644 --- a/ci/helpers/requirements.txt +++ b/ci/helpers/requirements.txt @@ -37,7 +37,7 @@ multidict==5.2.0 # via # aiohttp # yarl -pydantic==1.8.2 +pydantic==1.9.0 # via fastapi pyjwt==2.3.0 # via -r requirements.in diff --git a/packages/dask-task-models-library/requirements/_base.txt b/packages/dask-task-models-library/requirements/_base.txt index 42e99590386..a86fd113085 100644 --- a/packages/dask-task-models-library/requirements/_base.txt +++ b/packages/dask-task-models-library/requirements/_base.txt @@ -46,7 +46,7 @@ partd==1.2.0 # via dask psutil==5.8.0 # via distributed -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt diff --git a/packages/models-library/requirements/_base.txt b/packages/models-library/requirements/_base.txt index e1e1be88f80..5d4590e37a2 100644 --- a/packages/models-library/requirements/_base.txt +++ b/packages/models-library/requirements/_base.txt @@ -12,7 +12,7 @@ idna==2.10 # via # -r requirements/_base.in # email-validator -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in diff --git a/packages/service-integration/requirements/_base.txt b/packages/service-integration/requirements/_base.txt index 1cab18de7d9..37fd0492bfc 100644 --- a/packages/service-integration/requirements/_base.txt +++ b/packages/service-integration/requirements/_base.txt @@ -40,7 +40,7 @@ pluggy==1.0.0 # via pytest py==1.11.0 # via pytest -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt diff --git a/packages/service-integration/requirements/_tools.txt b/packages/service-integration/requirements/_tools.txt index 72aef0f88d4..4d8a4cbdb21 100644 --- a/packages/service-integration/requirements/_tools.txt +++ b/packages/service-integration/requirements/_tools.txt @@ -123,7 +123,7 @@ prance==0.21.8.0 # via datamodel-code-generator pre-commit==2.15.0 # via -r requirements/../../../requirements/devenv.txt -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt index 41bdf64cda3..7a6384d2347 100644 --- a/packages/service-library/requirements/_base.txt +++ b/packages/service-library/requirements/_base.txt @@ -8,7 +8,7 @@ aiodebug==1.1.2 # via -r requirements/_base.in aiofiles==0.8.0 # via -r requirements/_base.in -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in diff --git a/packages/service-library/requirements/_fastapi.txt b/packages/service-library/requirements/_fastapi.txt index 11ad6a9c8e8..f2ba783ee2d 100644 --- a/packages/service-library/requirements/_fastapi.txt +++ b/packages/service-library/requirements/_fastapi.txt @@ -22,7 +22,7 @@ opentracing==2.4.0 # via # fastapi-contrib # jaeger-client -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/./../../../requirements/constraints.txt # -c requirements/./_base.in diff --git a/packages/settings-library/requirements/_base.txt b/packages/settings-library/requirements/_base.txt index 4105a832a78..4ed2575abf9 100644 --- a/packages/settings-library/requirements/_base.txt +++ b/packages/settings-library/requirements/_base.txt @@ -6,7 +6,7 @@ # click==8.0.3 # via typer -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index 88dfe643b99..a29faf9338a 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -71,7 +71,7 @@ psycopg2-binary==2.9.2 # via # aiopg # sqlalchemy -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index aeea7cbce0a..df5005a9742 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -180,7 +180,7 @@ psycopg2-binary==2.9.1 # sqlalchemy pycparser==2.20 # via cffi -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index 92370c5c28f..73ef57c1008 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -115,7 +115,7 @@ psycopg2-binary==2.8.6 # via # aiopg # sqlalchemy -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt index 3f3a4abb577..0ccfe060b0f 100644 --- a/services/dask-sidecar/requirements/_base.txt +++ b/services/dask-sidecar/requirements/_base.txt @@ -192,7 +192,7 @@ ptyprocess==0.7.0 # via terminado pycparser==2.20 # via cffi -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt diff --git a/services/dask-sidecar/requirements/_packages.txt b/services/dask-sidecar/requirements/_packages.txt index 411e552dc4b..dc09a76f1c0 100644 --- a/services/dask-sidecar/requirements/_packages.txt +++ b/services/dask-sidecar/requirements/_packages.txt @@ -85,7 +85,7 @@ psutil==5.8.0 # via # -c requirements/_base.txt # distributed -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt index eb6cbfbc4c2..59756b1011d 100644 --- a/services/datcore-adapter/requirements/_base.txt +++ b/services/datcore-adapter/requirements/_base.txt @@ -109,7 +109,7 @@ pyasn1==0.4.8 # via # python-jose # rsa -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index 5ca9fcce531..c5893df88cc 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -233,7 +233,7 @@ psycopg2-binary==2.9.2 # via # aiopg # sqlalchemy -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index 9c7950c195b..3d34e437989 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in # -aio_pika==6.8.0 +aio-pika==6.8.0 # via # -c requirements/_base.txt # -r requirements/_test.in diff --git a/services/dynamic-sidecar/requirements/_base.txt b/services/dynamic-sidecar/requirements/_base.txt index dcb8a3933f0..c3590d83f3a 100644 --- a/services/dynamic-sidecar/requirements/_base.txt +++ b/services/dynamic-sidecar/requirements/_base.txt @@ -199,7 +199,7 @@ psycopg2-binary==2.9.1 # sqlalchemy pycparser==2.20 # via cffi -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index 203dffbae8d..2d09650f854 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -141,7 +141,7 @@ psycopg2-binary==2.9.1 # via # aiopg # sqlalchemy -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index 4cd213fafc3..fa32eb63c59 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -198,7 +198,7 @@ psycopg2-binary==2.9.1 # sqlalchemy pycparser==2.20 # via cffi -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/tests/environment-setup/requirements/requirements.txt b/tests/environment-setup/requirements/requirements.txt index fcef9fcf65e..70a5e48f1aa 100644 --- a/tests/environment-setup/requirements/requirements.txt +++ b/tests/environment-setup/requirements/requirements.txt @@ -43,7 +43,7 @@ pluggy==1.0.0 # via pytest py==1.11.0 # via pytest -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/service-library/requirements/_base.in diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt index d9ee5d028e5..55e0497a715 100644 --- a/tests/swarm-deploy/requirements/_test.txt +++ b/tests/swarm-deploy/requirements/_test.txt @@ -152,7 +152,7 @@ psycopg2-binary==2.9.2 # sqlalchemy py==1.11.0 # via pytest -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt From 543b146e1bd6f70cedad2b911bfe6147874aac73 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:53:21 +0100 Subject: [PATCH 02/12] fixes linter --- packages/models-library/src/models_library/utils/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/models-library/src/models_library/utils/misc.py b/packages/models-library/src/models_library/utils/misc.py index 011a1a24e69..c06dede6056 100644 --- a/packages/models-library/src/models_library/utils/misc.py +++ b/packages/models-library/src/models_library/utils/misc.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List, Type, Union from pydantic import BaseModel -from pydantic.main import SchemaExtraCallable +from pydantic.config import SchemaExtraCallable def extract_examples(model_cls: Type[BaseModel]) -> List[Dict[str, Any]]: From baaff0e03e642e4b1c3b48ff6d355406c00de3e0 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:58:13 +0100 Subject: [PATCH 03/12] Removes monkey_patch_pydantic_url_regex --- .../src/models_library/rest_pagination.py | 44 ------------------- .../simcore_service_webserver/application.py | 4 -- 2 files changed, 48 deletions(-) diff --git a/packages/models-library/src/models_library/rest_pagination.py b/packages/models-library/src/models_library/rest_pagination.py index 409fcf13219..597ddaa1777 100644 --- a/packages/models-library/src/models_library/rest_pagination.py +++ b/packages/models-library/src/models_library/rest_pagination.py @@ -14,50 +14,6 @@ DEFAULT_NUMBER_OF_ITEMS_PER_PAGE = 20 -def monkey_patch_pydantic_url_regex() -> None: - # waiting for PR https://github.com/samuelcolvin/pydantic/pull/2512 to be released into - # pydantic main codebase - import pydantic - - if pydantic.VERSION > "1.8.2": - raise RuntimeError( - ( - "Please check that PR https://github.com/samuelcolvin/pydantic/pull/2512 " - "was merged AND added in this version." - "If already present in this version, remove this monkey_patch" - ) - ) - - import re - from typing import Pattern - - from pydantic import networks - - def url_regex() -> Pattern[str]: - _url_regex_cache = networks._url_regex_cache # pylint: disable=protected-access - if _url_regex_cache is None: - _url_regex_cache = re.compile( - r"(?:(?P[a-z][a-z0-9+\-.]+)://)?" # scheme https://tools.ietf.org/html/rfc3986#appendix-A - r"(?:(?P[^\s:/]*)(?::(?P[^\s/]*))?@)?" # user info - r"(?:" - r"(?P(?:\d{1,3}\.){3}\d{1,3})(?=$|[/:#?])|" # ipv4 - r"(?P\[[A-F0-9]*:[A-F0-9:]+\])(?=$|[/:#?])|" # ipv6 - r"(?P[^\s/:?#]+)" # domain, validation occurs later - r")?" - r"(?::(?P\d+))?" # port - r"(?P/[^\s?#]*)?" # path - r"(?:\?(?P[^\s#]+))?" # query - r"(?:#(?P\S+))?", # fragment - re.IGNORECASE, - ) - return _url_regex_cache - - networks.url_regex = url_regex - - -monkey_patch_pydantic_url_regex() - - class PageMetaInfoLimitOffset(BaseModel): limit: PositiveInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE total: NonNegativeInt diff --git a/services/web/server/src/simcore_service_webserver/application.py b/services/web/server/src/simcore_service_webserver/application.py index 6acdbf57836..096543057ab 100644 --- a/services/web/server/src/simcore_service_webserver/application.py +++ b/services/web/server/src/simcore_service_webserver/application.py @@ -6,7 +6,6 @@ from typing import Any, Dict from aiohttp import web -from models_library.rest_pagination import monkey_patch_pydantic_url_regex from servicelib.aiohttp.application import create_safe_application from ._constants import APP_SETTINGS_KEY @@ -43,9 +42,6 @@ from .users import setup_users from .version_control import setup_version_control -monkey_patch_pydantic_url_regex() - - log = logging.getLogger(__name__) From 338b8effd29c576541a76718f217917c82f96e37 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:02:49 +0100 Subject: [PATCH 04/12] Fixes PkgResourcesDeprecationWarning: 0.6a9dev-r41475 is an invalid version and will not be supported in a future release --- packages/models-library/tests/test_basic_regex.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/models-library/tests/test_basic_regex.py b/packages/models-library/tests/test_basic_regex.py index 55ab84e60e0..9e2ac1a5cf5 100644 --- a/packages/models-library/tests/test_basic_regex.py +++ b/packages/models-library/tests/test_basic_regex.py @@ -8,7 +8,7 @@ import pytest from models_library.basic_regex import DATE_RE, UUID_RE, VERSION_RE -from pkg_resources import parse_version +from packaging.version import Version INVALID = object() VALID = object() @@ -97,6 +97,6 @@ def test_DATE_RE(date_str, expected): def test_pep404_compare_versions(): # A reminder from https://setuptools.readthedocs.io/en/latest/userguide/distribution.html#specifying-your-project-s-version - assert parse_version("1.9.a.dev") == parse_version("1.9a0dev") - assert parse_version("2.1-rc2") < parse_version("2.1") - assert parse_version("0.6a9dev-r41475") < parse_version("0.6a9") + assert Version("1.9.a.dev") == Version("1.9a0dev") + assert Version("2.1-rc2") < Version("2.1") + assert Version("0.6a9dev") < Version("0.6a9") From 9c3258e206f24ec43a60227172195584c90fed57 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:46:08 +0100 Subject: [PATCH 05/12] fixes E ValueError: default cannot be set in for 'key___root__' --- .../src/dask_task_models_library/container_tasks/io.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py b/packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py index b3114a8b0b6..7c4c542f656 100644 --- a/packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py +++ b/packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py @@ -15,7 +15,7 @@ StrictInt, StrictStr, ) -from typing_extensions import Annotated +from pydantic.types import constr class PortSchema(BaseModel): @@ -74,7 +74,7 @@ class Config: } -PortKey = Annotated[str, Field(regex=PROPERTY_KEY_RE)] +PortKey = constr(regex=PROPERTY_KEY_RE) PortValue = Union[StrictBool, StrictInt, StrictFloat, StrictStr, FileUrl, None] From f6fc1b5b089e9f03edb34795be07b4b8b5e31afb Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 17:30:02 +0100 Subject: [PATCH 06/12] public-api tests uploads logs if fails --- .github/workflows/ci-testing-deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index 5fcdea8633c..f3907034b0f 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -2118,6 +2118,12 @@ jobs: run: ./ci/github/system-testing/public-api.bash install - name: test run: ./ci/github/system-testing/public-api.bash test + - name: upload failed tests logs + if: failure() + uses: actions/upload-artifact@v2 + with: + name: ${{ github.job }}_docker_logs + path: ./tests/public-api/test_failures - name: cleanup if: always() run: ./ci/github/system-testing/public-api.bash clean_up From 7bf561020caeec42b8f4c1dc672d44b20785ce04 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 18:18:11 +0100 Subject: [PATCH 07/12] adds constraint on tomli introduced by black (all backstream verified) --- requirements/constraints.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 7e83e432636..78fc8c44b4a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -41,10 +41,14 @@ minio==7.0.4 # - # Keeps all docker compose to the same version. TODO: remove when all synced docker-compose==1.29.1 + +# tomli<2.0.0,>=0.2.6 (from black==21.12b0->-r requirements/../../../requirements/devenv.txt (line 19)) +tomli<2.0.0 + + # constraint since https://github.com/MagicStack/uvloop/releases/tag/v0.15.0: drops support for 3.5/3.6 Feb.2021 uvloop<0.15.0 ; python_version < '3.7' From 784c1295118ae4ddf00d07330cb04e49c03fb930 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 18:18:31 +0100 Subject: [PATCH 08/12] upgrades api-server reqs --- services/api-server/requirements/_base.txt | 80 ++++++++++----------- services/api-server/requirements/_test.txt | 76 ++++++++++---------- services/api-server/requirements/_tools.txt | 25 ++++--- 3 files changed, 88 insertions(+), 93 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index df5005a9742..1bf2722eb7c 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -4,12 +4,12 @@ # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in # -aiodebug==1.1.2 +aiodebug==2.3.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -aiofiles==0.5.0 +aiofiles==0.8.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -29,11 +29,11 @@ aiohttp==3.7.4.post0 # -c requirements/../../../requirements/constraints.txt # -c requirements/./constraints.txt # -r requirements/../../../packages/simcore-sdk/requirements/_base.in -aiopg==1.2.1 +aiopg==1.3.3 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -alembic==1.7.4 +alembic==1.7.5 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in @@ -54,24 +54,24 @@ attrs==20.3.0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -r requirements/_base.in # aiohttp -certifi==2020.12.5 +certifi==2021.10.8 # via # httpcore # httpx # requests -cffi==1.14.5 +cffi==1.15.0 # via cryptography chardet==4.0.0 + # via aiohttp +charset-normalizer==2.0.10 # via - # aiohttp + # httpx # requests -charset-normalizer==2.0.10 - # via httpx -click==7.1.2 +click==8.0.3 # via # typer # uvicorn -cryptography==3.4.7 +cryptography==36.0.1 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -84,13 +84,13 @@ cryptography==3.4.7 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in -dnspython==2.1.0 +dnspython==2.2.0 # via email-validator -email-validator==1.1.2 +email-validator==1.1.3 # via # fastapi # pydantic -fastapi==0.71.0 +fastapi==0.72.0 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in @@ -101,7 +101,7 @@ h11==0.12.0 # via # httpcore # uvicorn -httpcore==0.14.4 +httpcore==0.14.5 # via httpx httptools==0.2.0 # via uvicorn @@ -121,9 +121,9 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.8.1 +importlib-metadata==4.10.1 # via alembic -importlib-resources==5.3.0 ; python_version < "3.9" +importlib-resources==5.4.0 ; python_version < "3.9" # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -137,11 +137,11 @@ importlib-resources==5.3.0 ; python_version < "3.9" # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in # alembic -itsdangerous==1.1.0 +itsdangerous==2.0.1 # via fastapi jaeger-client==4.8.0 # via fastapi-contrib -jinja2==2.11.3 +jinja2==3.0.3 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -154,13 +154,13 @@ jinja2==2.11.3 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # fastapi -mako==1.1.5 +mako==1.1.6 # via alembic markupsafe==2.0.1 # via # jinja2 # mako -multidict==5.1.0 +multidict==5.2.0 # via # aiohttp # yarl @@ -168,17 +168,17 @@ opentracing==2.4.0 # via # fastapi-contrib # jaeger-client -orjson==3.5.2 +orjson==3.6.5 # via fastapi -packaging==20.9 +packaging==21.3 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -psycopg2-binary==2.9.1 +psycopg2-binary==2.9.3 # via # aiopg # sqlalchemy -pycparser==2.20 +pycparser==2.21 # via cffi pydantic==1.9.0 # via @@ -201,16 +201,14 @@ pydantic==1.9.0 # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in # fastapi -pyinstrument==3.4.2 +pyinstrument==4.1.1 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -pyinstrument-cext==0.2.4 - # via pyinstrument -pyparsing==2.4.7 +pyparsing==3.0.6 # via packaging -python-dotenv==0.17.1 +python-dotenv==0.19.2 # via # pydantic # uvicorn @@ -236,14 +234,13 @@ pyyaml==5.4.1 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # fastapi # uvicorn -requests==2.25.1 +requests==2.27.1 # via fastapi rfc3986==1.5.0 # via httpx six==1.16.0 # via # python-multipart - # tenacity # thrift sniffio==1.2.0 # via @@ -268,7 +265,7 @@ sqlalchemy==1.3.24 # alembic starlette==0.17.1 # via fastapi -tenacity==7.0.0 +tenacity==8.0.1 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -277,23 +274,24 @@ tenacity==7.0.0 # -r requirements/_base.in threadloop==1.0.2 # via jaeger-client -thrift==0.13.0 +thrift==0.15.0 # via jaeger-client tornado==6.1 # via # jaeger-client # threadloop -tqdm==4.60.0 +tqdm==4.62.3 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in typer==0.4.0 # via -r requirements/../../../packages/settings-library/requirements/_base.in -typing-extensions==3.10.0.2 +typing-extensions==4.0.1 # via + # aiodebug # aiohttp # pydantic -ujson==4.0.2 +ujson==4.3.0 # via fastapi -urllib3==1.26.7 +urllib3==1.26.8 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -308,18 +306,18 @@ urllib3==1.26.7 # requests uvicorn==0.15.0 # via fastapi -uvloop==0.14.0 +uvloop==0.16.0 # via uvicorn watchgod==0.7 # via uvicorn websockets==10.1 # via uvicorn -yarl==1.6.3 +yarl==1.7.2 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp -zipp==3.6.0 +zipp==3.7.0 # via # importlib-metadata # importlib-resources diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 2ab5b87e72d..7eecca6a7f5 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in # -alembic==1.7.4 +alembic==1.7.5 # via # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in @@ -15,7 +15,7 @@ anyio==3.5.0 # httpcore asgi-lifespan==1.0.1 # via -r requirements/_test.in -astroid==2.9.0 +astroid==2.9.3 # via pylint attrs==20.3.0 # via @@ -27,40 +27,37 @@ bcrypt==3.2.0 # via # paramiko # passlib -certifi==2020.12.5 +certifi==2021.10.8 # via # -c requirements/_base.txt # httpcore # httpx # requests -cffi==1.14.5 +cffi==1.15.0 # via # -c requirements/_base.txt # bcrypt # cryptography # pynacl -chardet==4.0.0 - # via - # -c requirements/_base.txt - # requests charset-normalizer==2.0.10 # via # -c requirements/_base.txt # httpx -click==7.1.2 + # requests +click==8.0.3 # via # -c requirements/_base.txt # -r requirements/_test.in codecov==2.1.12 # via -r requirements/_test.in -coverage==6.1.2 +coverage==6.2 # via # codecov # coveralls # pytest-cov coveralls==3.3.1 # via -r requirements/_test.in -cryptography==3.4.7 +cryptography==36.0.1 # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -83,13 +80,13 @@ docopt==0.6.2 # via # coveralls # docker-compose -faker==9.8.3 +faker==11.3.0 # via -r requirements/_test.in h11==0.12.0 # via # -c requirements/_base.txt # httpcore -httpcore==0.14.4 +httpcore==0.14.5 # via # -c requirements/_base.txt # httpx @@ -105,11 +102,11 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.8.1 +importlib-metadata==4.10.1 # via # -c requirements/_base.txt # alembic -importlib-resources==5.3.0 ; python_version < "3.9" +importlib-resources==5.4.0 ; python_version < "3.9" # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -121,9 +118,9 @@ isort==5.10.1 # via pylint jsonschema==3.2.0 # via docker-compose -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via astroid -mako==1.1.5 +mako==1.1.6 # via # -c requirements/_base.txt # alembic @@ -133,41 +130,41 @@ markupsafe==2.0.1 # mako mccabe==0.6.1 # via pylint -multidict==5.1.0 +multidict==5.2.0 # via # -c requirements/_base.txt # yarl -packaging==20.9 +packaging==21.3 # via # -c requirements/_base.txt # pytest -paramiko==2.8.0 +paramiko==2.9.2 # via docker passlib==1.7.4 # via -r requirements/_test.in -platformdirs==2.4.0 +platformdirs==2.4.1 # via pylint pluggy==1.0.0 # via pytest -psycopg2-binary==2.9.1 +psycopg2-binary==2.9.3 # via # -c requirements/_base.txt # sqlalchemy py==1.11.0 # via pytest -pycparser==2.20 +pycparser==2.21 # via # -c requirements/_base.txt # cffi -pylint==2.12.1 +pylint==2.12.2 # via -r requirements/_test.in -pynacl==1.4.0 +pynacl==1.5.0 # via paramiko -pyparsing==2.4.7 +pyparsing==3.0.6 # via # -c requirements/_base.txt # packaging -pyrsistent==0.18.0 +pyrsistent==0.18.1 # via jsonschema pytest==6.2.5 # via @@ -176,7 +173,7 @@ pytest==6.2.5 # pytest-cov # pytest-docker # pytest-mock -pytest-asyncio==0.16.0 +pytest-asyncio==0.17.2 # via -r requirements/_test.in pytest-cov==3.0.0 # via -r requirements/_test.in @@ -188,7 +185,7 @@ pytest-runner==5.3.1 # via -r requirements/_test.in python-dateutil==2.8.2 # via faker -python-dotenv==0.17.1 +python-dotenv==0.19.2 # via # -c requirements/_base.txt # docker-compose @@ -198,7 +195,7 @@ pyyaml==5.4.1 # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # docker-compose -requests==2.25.1 +requests==2.27.1 # via # -c requirements/_base.txt # codecov @@ -217,9 +214,7 @@ six==1.16.0 # bcrypt # dockerpty # jsonschema - # pynacl # python-dateutil - # tenacity # websocket-client sniffio==1.2.0 # via @@ -235,7 +230,7 @@ sqlalchemy==1.3.24 # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in # alembic -tenacity==7.0.0 +tenacity==8.0.1 # via # -c requirements/_base.txt # -r requirements/_test.in @@ -247,14 +242,17 @@ toml==0.10.2 # via # pylint # pytest -tomli==1.2.2 - # via coverage -typing-extensions==3.10.0.2 +tomli==1.2.3 + # via + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # coverage +typing-extensions==4.0.1 # via # -c requirements/_base.txt # astroid # pylint -urllib3==1.26.7 +urllib3==1.26.8 # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -266,11 +264,11 @@ websocket-client==0.59.0 # docker-compose wrapt==1.13.3 # via astroid -yarl==1.6.3 +yarl==1.7.2 # via # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in -zipp==3.6.0 +zipp==3.7.0 # via # -c requirements/_base.txt # importlib-metadata diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index 951d51ecce4..41badec255e 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -4,8 +4,6 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -backports.entry-points-selectable==1.1.1 - # via virtualenv black==21.12b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 @@ -14,23 +12,23 @@ cfgv==3.3.1 # via pre-commit change-case==0.5.2 # via -r requirements/_tools.in -click==7.1.2 +click==8.0.3 # via # -c requirements/_base.txt # -c requirements/_test.txt # black # pip-tools -distlib==0.3.3 +distlib==0.3.4 # via virtualenv -filelock==3.4.0 +filelock==3.4.2 # via virtualenv -identify==2.4.0 +identify==2.4.4 # via pre-commit isort==5.10.1 # via # -c requirements/_test.txt # -r requirements/../../../requirements/devenv.txt -jinja2==2.11.3 +jinja2==3.0.3 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -50,12 +48,12 @@ pep517==0.12.0 # via pip-tools pip-tools==6.4.0 # via -r requirements/../../../requirements/devenv.txt -platformdirs==2.4.0 +platformdirs==2.4.1 # via # -c requirements/_test.txt # black # virtualenv -pre-commit==2.15.0 +pre-commit==2.17.0 # via -r requirements/../../../requirements/devenv.txt ptvsd==4.3.2 # via -r requirements/_tools.in @@ -75,21 +73,22 @@ toml==0.10.2 # via # -c requirements/_test.txt # pre-commit -tomli==1.2.2 +tomli==1.2.3 # via + # -c requirements/../../../requirements/constraints.txt # -c requirements/_test.txt # black # pep517 -typing-extensions==3.10.0.2 +typing-extensions==4.0.1 # via # -c requirements/_base.txt # -c requirements/_test.txt # black -virtualenv==20.10.0 +virtualenv==20.13.0 # via pre-commit watchdog==2.1.6 # via -r requirements/_tools.in -wheel==0.37.0 +wheel==0.37.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: From 9fff4c3c5347cb61b1b09d178c17f5929dc7ddb0 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 18:28:32 +0100 Subject: [PATCH 09/12] fixes paths to test_failures --- .github/workflows/ci-testing-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index f3907034b0f..c039f62a28f 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -2123,7 +2123,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${{ github.job }}_docker_logs - path: ./tests/public-api/test_failures + path: ./test_failures - name: cleanup if: always() run: ./ci/github/system-testing/public-api.bash clean_up @@ -2183,7 +2183,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${{ github.job }}_docker_logs - path: ./tests/swarm-deploy/test_failures + path: ./test_failures - name: cleanup if: always() run: ./ci/github/system-testing/swarm-deploy.bash clean_up From e165308160278f65c68266689aaf826a46bd2e02 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 20 Jan 2022 23:32:46 +0100 Subject: [PATCH 10/12] reverted changes in api-server --- services/api-server/requirements/_base.txt | 82 +++++++++++---------- services/api-server/requirements/_test.txt | 76 +++++++++---------- services/api-server/requirements/_tools.txt | 25 ++++--- 3 files changed, 94 insertions(+), 89 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 1bf2722eb7c..aeea7cbce0a 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -4,12 +4,12 @@ # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in # -aiodebug==2.3.0 +aiodebug==1.1.2 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -aiofiles==0.8.0 +aiofiles==0.5.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -29,11 +29,11 @@ aiohttp==3.7.4.post0 # -c requirements/../../../requirements/constraints.txt # -c requirements/./constraints.txt # -r requirements/../../../packages/simcore-sdk/requirements/_base.in -aiopg==1.3.3 +aiopg==1.2.1 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -alembic==1.7.5 +alembic==1.7.4 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in @@ -54,24 +54,24 @@ attrs==20.3.0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -r requirements/_base.in # aiohttp -certifi==2021.10.8 +certifi==2020.12.5 # via # httpcore # httpx # requests -cffi==1.15.0 +cffi==1.14.5 # via cryptography chardet==4.0.0 - # via aiohttp -charset-normalizer==2.0.10 # via - # httpx + # aiohttp # requests -click==8.0.3 +charset-normalizer==2.0.10 + # via httpx +click==7.1.2 # via # typer # uvicorn -cryptography==36.0.1 +cryptography==3.4.7 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -84,13 +84,13 @@ cryptography==36.0.1 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in -dnspython==2.2.0 +dnspython==2.1.0 # via email-validator -email-validator==1.1.3 +email-validator==1.1.2 # via # fastapi # pydantic -fastapi==0.72.0 +fastapi==0.71.0 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in @@ -101,7 +101,7 @@ h11==0.12.0 # via # httpcore # uvicorn -httpcore==0.14.5 +httpcore==0.14.4 # via httpx httptools==0.2.0 # via uvicorn @@ -121,9 +121,9 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.10.1 +importlib-metadata==4.8.1 # via alembic -importlib-resources==5.4.0 ; python_version < "3.9" +importlib-resources==5.3.0 ; python_version < "3.9" # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -137,11 +137,11 @@ importlib-resources==5.4.0 ; python_version < "3.9" # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in # alembic -itsdangerous==2.0.1 +itsdangerous==1.1.0 # via fastapi jaeger-client==4.8.0 # via fastapi-contrib -jinja2==3.0.3 +jinja2==2.11.3 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -154,13 +154,13 @@ jinja2==3.0.3 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # fastapi -mako==1.1.6 +mako==1.1.5 # via alembic markupsafe==2.0.1 # via # jinja2 # mako -multidict==5.2.0 +multidict==5.1.0 # via # aiohttp # yarl @@ -168,19 +168,19 @@ opentracing==2.4.0 # via # fastapi-contrib # jaeger-client -orjson==3.6.5 +orjson==3.5.2 # via fastapi -packaging==21.3 +packaging==20.9 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -psycopg2-binary==2.9.3 +psycopg2-binary==2.9.1 # via # aiopg # sqlalchemy -pycparser==2.21 +pycparser==2.20 # via cffi -pydantic==1.9.0 +pydantic==1.8.2 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -201,14 +201,16 @@ pydantic==1.9.0 # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in # fastapi -pyinstrument==4.1.1 +pyinstrument==3.4.2 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -pyparsing==3.0.6 +pyinstrument-cext==0.2.4 + # via pyinstrument +pyparsing==2.4.7 # via packaging -python-dotenv==0.19.2 +python-dotenv==0.17.1 # via # pydantic # uvicorn @@ -234,13 +236,14 @@ pyyaml==5.4.1 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # fastapi # uvicorn -requests==2.27.1 +requests==2.25.1 # via fastapi rfc3986==1.5.0 # via httpx six==1.16.0 # via # python-multipart + # tenacity # thrift sniffio==1.2.0 # via @@ -265,7 +268,7 @@ sqlalchemy==1.3.24 # alembic starlette==0.17.1 # via fastapi -tenacity==8.0.1 +tenacity==7.0.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -274,24 +277,23 @@ tenacity==8.0.1 # -r requirements/_base.in threadloop==1.0.2 # via jaeger-client -thrift==0.15.0 +thrift==0.13.0 # via jaeger-client tornado==6.1 # via # jaeger-client # threadloop -tqdm==4.62.3 +tqdm==4.60.0 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in typer==0.4.0 # via -r requirements/../../../packages/settings-library/requirements/_base.in -typing-extensions==4.0.1 +typing-extensions==3.10.0.2 # via - # aiodebug # aiohttp # pydantic -ujson==4.3.0 +ujson==4.0.2 # via fastapi -urllib3==1.26.8 +urllib3==1.26.7 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -306,18 +308,18 @@ urllib3==1.26.8 # requests uvicorn==0.15.0 # via fastapi -uvloop==0.16.0 +uvloop==0.14.0 # via uvicorn watchgod==0.7 # via uvicorn websockets==10.1 # via uvicorn -yarl==1.7.2 +yarl==1.6.3 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp -zipp==3.7.0 +zipp==3.6.0 # via # importlib-metadata # importlib-resources diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 7eecca6a7f5..2ab5b87e72d 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in # -alembic==1.7.5 +alembic==1.7.4 # via # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in @@ -15,7 +15,7 @@ anyio==3.5.0 # httpcore asgi-lifespan==1.0.1 # via -r requirements/_test.in -astroid==2.9.3 +astroid==2.9.0 # via pylint attrs==20.3.0 # via @@ -27,37 +27,40 @@ bcrypt==3.2.0 # via # paramiko # passlib -certifi==2021.10.8 +certifi==2020.12.5 # via # -c requirements/_base.txt # httpcore # httpx # requests -cffi==1.15.0 +cffi==1.14.5 # via # -c requirements/_base.txt # bcrypt # cryptography # pynacl +chardet==4.0.0 + # via + # -c requirements/_base.txt + # requests charset-normalizer==2.0.10 # via # -c requirements/_base.txt # httpx - # requests -click==8.0.3 +click==7.1.2 # via # -c requirements/_base.txt # -r requirements/_test.in codecov==2.1.12 # via -r requirements/_test.in -coverage==6.2 +coverage==6.1.2 # via # codecov # coveralls # pytest-cov coveralls==3.3.1 # via -r requirements/_test.in -cryptography==36.0.1 +cryptography==3.4.7 # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -80,13 +83,13 @@ docopt==0.6.2 # via # coveralls # docker-compose -faker==11.3.0 +faker==9.8.3 # via -r requirements/_test.in h11==0.12.0 # via # -c requirements/_base.txt # httpcore -httpcore==0.14.5 +httpcore==0.14.4 # via # -c requirements/_base.txt # httpx @@ -102,11 +105,11 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.10.1 +importlib-metadata==4.8.1 # via # -c requirements/_base.txt # alembic -importlib-resources==5.4.0 ; python_version < "3.9" +importlib-resources==5.3.0 ; python_version < "3.9" # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -118,9 +121,9 @@ isort==5.10.1 # via pylint jsonschema==3.2.0 # via docker-compose -lazy-object-proxy==1.7.1 +lazy-object-proxy==1.6.0 # via astroid -mako==1.1.6 +mako==1.1.5 # via # -c requirements/_base.txt # alembic @@ -130,41 +133,41 @@ markupsafe==2.0.1 # mako mccabe==0.6.1 # via pylint -multidict==5.2.0 +multidict==5.1.0 # via # -c requirements/_base.txt # yarl -packaging==21.3 +packaging==20.9 # via # -c requirements/_base.txt # pytest -paramiko==2.9.2 +paramiko==2.8.0 # via docker passlib==1.7.4 # via -r requirements/_test.in -platformdirs==2.4.1 +platformdirs==2.4.0 # via pylint pluggy==1.0.0 # via pytest -psycopg2-binary==2.9.3 +psycopg2-binary==2.9.1 # via # -c requirements/_base.txt # sqlalchemy py==1.11.0 # via pytest -pycparser==2.21 +pycparser==2.20 # via # -c requirements/_base.txt # cffi -pylint==2.12.2 +pylint==2.12.1 # via -r requirements/_test.in -pynacl==1.5.0 +pynacl==1.4.0 # via paramiko -pyparsing==3.0.6 +pyparsing==2.4.7 # via # -c requirements/_base.txt # packaging -pyrsistent==0.18.1 +pyrsistent==0.18.0 # via jsonschema pytest==6.2.5 # via @@ -173,7 +176,7 @@ pytest==6.2.5 # pytest-cov # pytest-docker # pytest-mock -pytest-asyncio==0.17.2 +pytest-asyncio==0.16.0 # via -r requirements/_test.in pytest-cov==3.0.0 # via -r requirements/_test.in @@ -185,7 +188,7 @@ pytest-runner==5.3.1 # via -r requirements/_test.in python-dateutil==2.8.2 # via faker -python-dotenv==0.19.2 +python-dotenv==0.17.1 # via # -c requirements/_base.txt # docker-compose @@ -195,7 +198,7 @@ pyyaml==5.4.1 # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # docker-compose -requests==2.27.1 +requests==2.25.1 # via # -c requirements/_base.txt # codecov @@ -214,7 +217,9 @@ six==1.16.0 # bcrypt # dockerpty # jsonschema + # pynacl # python-dateutil + # tenacity # websocket-client sniffio==1.2.0 # via @@ -230,7 +235,7 @@ sqlalchemy==1.3.24 # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in # alembic -tenacity==8.0.1 +tenacity==7.0.0 # via # -c requirements/_base.txt # -r requirements/_test.in @@ -242,17 +247,14 @@ toml==0.10.2 # via # pylint # pytest -tomli==1.2.3 - # via - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # coverage -typing-extensions==4.0.1 +tomli==1.2.2 + # via coverage +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # astroid # pylint -urllib3==1.26.8 +urllib3==1.26.7 # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -264,11 +266,11 @@ websocket-client==0.59.0 # docker-compose wrapt==1.13.3 # via astroid -yarl==1.7.2 +yarl==1.6.3 # via # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in -zipp==3.7.0 +zipp==3.6.0 # via # -c requirements/_base.txt # importlib-metadata diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index 41badec255e..951d51ecce4 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -4,6 +4,8 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # +backports.entry-points-selectable==1.1.1 + # via virtualenv black==21.12b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 @@ -12,23 +14,23 @@ cfgv==3.3.1 # via pre-commit change-case==0.5.2 # via -r requirements/_tools.in -click==8.0.3 +click==7.1.2 # via # -c requirements/_base.txt # -c requirements/_test.txt # black # pip-tools -distlib==0.3.4 +distlib==0.3.3 # via virtualenv -filelock==3.4.2 +filelock==3.4.0 # via virtualenv -identify==2.4.4 +identify==2.4.0 # via pre-commit isort==5.10.1 # via # -c requirements/_test.txt # -r requirements/../../../requirements/devenv.txt -jinja2==3.0.3 +jinja2==2.11.3 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -48,12 +50,12 @@ pep517==0.12.0 # via pip-tools pip-tools==6.4.0 # via -r requirements/../../../requirements/devenv.txt -platformdirs==2.4.1 +platformdirs==2.4.0 # via # -c requirements/_test.txt # black # virtualenv -pre-commit==2.17.0 +pre-commit==2.15.0 # via -r requirements/../../../requirements/devenv.txt ptvsd==4.3.2 # via -r requirements/_tools.in @@ -73,22 +75,21 @@ toml==0.10.2 # via # -c requirements/_test.txt # pre-commit -tomli==1.2.3 +tomli==1.2.2 # via - # -c requirements/../../../requirements/constraints.txt # -c requirements/_test.txt # black # pep517 -typing-extensions==4.0.1 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -c requirements/_test.txt # black -virtualenv==20.13.0 +virtualenv==20.10.0 # via pre-commit watchdog==2.1.6 # via -r requirements/_tools.in -wheel==0.37.1 +wheel==0.37.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: From 9b00c52882e747be73130b2cc71f29aaee0d46f2 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Fri, 21 Jan 2022 00:31:25 +0100 Subject: [PATCH 11/12] Fix: new HttUrl.build hides port --- packages/settings-library/src/settings_library/prometheus.py | 4 ++-- .../src/simcore_service_api_server/core/settings.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/settings-library/src/settings_library/prometheus.py b/packages/settings-library/src/settings_library/prometheus.py index 0e73f75c79a..a7174f227e4 100644 --- a/packages/settings-library/src/settings_library/prometheus.py +++ b/packages/settings-library/src/settings_library/prometheus.py @@ -1,6 +1,6 @@ from functools import cached_property -from pydantic.networks import HttpUrl +from pydantic.networks import AnyHttpUrl from settings_library.base import BaseCustomSettings from settings_library.utils_service import MixinServiceSettings @@ -14,7 +14,7 @@ class PrometheusSettings(BaseCustomSettings, MixinServiceSettings): @cached_property def base_url(self) -> str: - return HttpUrl.build( + return AnyHttpUrl.build( scheme="http", host=self.PROMETHEUS_HOST, port=f"{self.PROMETHEUS_PORT}", diff --git a/services/api-server/src/simcore_service_api_server/core/settings.py b/services/api-server/src/simcore_service_api_server/core/settings.py index 81be125255c..e055a561b19 100644 --- a/services/api-server/src/simcore_service_api_server/core/settings.py +++ b/services/api-server/src/simcore_service_api_server/core/settings.py @@ -2,9 +2,8 @@ from typing import Optional from models_library.basic_types import BootModeEnum, LogLevel -from pydantic import Field, SecretStr +from pydantic import AnyHttpUrl, Field, SecretStr from pydantic.class_validators import validator -from pydantic.networks import HttpUrl from settings_library.base import BaseCustomSettings from settings_library.postgres import PostgresSettings from settings_library.tracing import TracingSettings @@ -16,7 +15,7 @@ class _UrlMixin: def _build_url(self, prefix: str) -> str: prefix = prefix.upper() - return HttpUrl.build( + return AnyHttpUrl.build( scheme="http", host=getattr(self, f"{prefix}_HOST"), port=f"{getattr(self, f'{prefix}_PORT')}", From 0c92ab7913eae3679b26f00ff00634f3575c04b9 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Fri, 21 Jan 2022 00:42:00 +0100 Subject: [PATCH 12/12] upgraded pydantic in api-server --- services/api-server/requirements/_base.txt | 2 +- services/api-server/requirements/_test.txt | 5 ++++- services/api-server/requirements/_tools.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index aeea7cbce0a..df5005a9742 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -180,7 +180,7 @@ psycopg2-binary==2.9.1 # sqlalchemy pycparser==2.20 # via cffi -pydantic==1.8.2 +pydantic==1.9.0 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 2ab5b87e72d..6a41077b9d0 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -248,7 +248,10 @@ toml==0.10.2 # pylint # pytest tomli==1.2.2 - # via coverage + # via + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # coverage typing-extensions==3.10.0.2 # via # -c requirements/_base.txt diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index 951d51ecce4..412e1ccce00 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -77,6 +77,7 @@ toml==0.10.2 # pre-commit tomli==1.2.2 # via + # -c requirements/../../../requirements/constraints.txt # -c requirements/_test.txt # black # pep517