diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 807d843bf71..95e70663d6e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,6 +17,6 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 21.7b0 + rev: 21.9b0 hooks: - id: black diff --git a/README.md b/README.md index b4376816cba..56aa0ab3f32 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ [Code style: black]:https://img.shields.io/badge/code%20style-black-000000.svg -[Requires.io]:https://img.shields.io/requires/github/ITISFoundation/osparc-simcore.svg +[Requires.io]:https://img.shields.io/requires/github/ITISFoundation/osparc-simcore.svg?branch=master [travis-ci]:https://travis-ci.org/ITISFoundation/osparc-simcore.svg?branch=master [github.io]:https://img.shields.io/website-up-down-green-red/https/itisfoundation.github.io.svg?label=documentation [itis.dockerhub]:https://img.shields.io/website/https/hub.docker.com/u/itisfoundation.svg?down_color=red&label=dockerhub%20repos&up_color=green diff --git a/api/tests/requirements.txt b/api/tests/requirements.txt index af4b3c51d2f..1e4dfab064f 100644 --- a/api/tests/requirements.txt +++ b/api/tests/requirements.txt @@ -67,7 +67,7 @@ pyparsing==2.4.7 # via packaging pyrsistent==0.18.0 # via jsonschema -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements.in # pytest-aiohttp @@ -99,7 +99,7 @@ toml==0.10.2 # via # pytest # pytest-cov -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via aiohttp werkzeug==2.0.1 # via openapi-core diff --git a/docs/img/.stack-simcore-version.yml.png b/docs/img/.stack-simcore-version.yml.png index d02cdb4edcf..b5bee959c3e 100644 Binary files a/docs/img/.stack-simcore-version.yml.png and b/docs/img/.stack-simcore-version.yml.png differ diff --git a/packages/models-library/requirements/_base.txt b/packages/models-library/requirements/_base.txt index 2439b2b0217..fbdb5b5d27f 100644 --- a/packages/models-library/requirements/_base.txt +++ b/packages/models-library/requirements/_base.txt @@ -16,5 +16,5 @@ pydantic==1.8.2 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via pydantic diff --git a/packages/models-library/requirements/_test.txt b/packages/models-library/requirements/_test.txt index b1e2f12e110..ef3a76c59a4 100644 --- a/packages/models-library/requirements/_test.txt +++ b/packages/models-library/requirements/_test.txt @@ -9,7 +9,7 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # pytest-aiohttp -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via aiohttp @@ -71,11 +71,11 @@ psycopg2-binary==2.9.1 # via sqlalchemy py==1.10.0 # via pytest -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pyparsing==2.4.7 # via packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -123,10 +123,12 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # aiohttp + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/packages/models-library/requirements/_tools.txt b/packages/models-library/requirements/_tools.txt index 32201c54cd6..cdb85324060 100644 --- a/packages/models-library/requirements/_tools.txt +++ b/packages/models-library/requirements/_tools.txt @@ -4,11 +4,9 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -41,6 +39,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -63,6 +62,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit wheel==0.36.2 diff --git a/packages/postgres-database/requirements/_migration.txt b/packages/postgres-database/requirements/_migration.txt index 899ffa35e57..013ccb7f491 100644 --- a/packages/postgres-database/requirements/_migration.txt +++ b/packages/postgres-database/requirements/_migration.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_migration.txt --strip-extras requirements/_migration.in # -alembic==1.6.5 +alembic==1.7.3 # via -r requirements/_migration.in certifi==2021.5.30 # via requests @@ -12,12 +12,16 @@ charset-normalizer==2.0.4 # via requests click==8.0.1 # via -r requirements/_migration.in -docker==5.0.0 +docker==5.0.2 # via -r requirements/_migration.in idna==2.10 # via # -c requirements/_base.txt # requests +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../requirements/constraints.txt + # alembic mako==1.1.4 # via alembic markupsafe==2.0.1 @@ -26,16 +30,10 @@ psycopg2-binary==2.9.1 # via # -c requirements/_base.txt # sqlalchemy -python-dateutil==2.8.2 - # via alembic -python-editor==1.0.4 - # via alembic requests==2.26.0 # via docker six==1.16.0 - # via - # python-dateutil - # websocket-client + # via websocket-client sqlalchemy==1.3.24 # via # -c requirements/../../../requirements/constraints.txt @@ -52,3 +50,5 @@ websocket-client==0.59.0 # via # -r requirements/_migration.in # docker +zipp==3.5.0 + # via importlib-resources diff --git a/packages/postgres-database/requirements/_test.txt b/packages/postgres-database/requirements/_test.txt index 48be83bec0e..3e3544b83ae 100644 --- a/packages/postgres-database/requirements/_test.txt +++ b/packages/postgres-database/requirements/_test.txt @@ -10,7 +10,7 @@ aiohttp==3.7.4.post0 # pytest-aiohttp aiopg==1.3.1 # via -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -52,7 +52,7 @@ cryptography==3.4.7 # paramiko distro==1.6.0 # via docker-compose -docker==5.0.0 +docker==5.0.2 # via # -c requirements/_migration.txt # docker-compose @@ -107,7 +107,7 @@ py==1.10.0 # via pytest pycparser==2.20 # via cffi -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pynacl==1.4.0 # via paramiko @@ -115,7 +115,7 @@ pyparsing==2.4.7 # via packaging pyrsistent==0.18.0 # via jsonschema -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -133,9 +133,7 @@ pytest-instafail==0.4.2 pytest-runner==5.3.1 # via -r requirements/_test.in python-dateutil==2.8.2 - # via - # -c requirements/_migration.txt - # faker + # via faker python-dotenv==0.19.0 # via docker-compose pyyaml==5.4.1 @@ -173,8 +171,11 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.10.0.0 - # via aiohttp +typing-extensions==3.10.0.2 + # via + # aiohttp + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt diff --git a/packages/postgres-database/requirements/_tools.txt b/packages/postgres-database/requirements/_tools.txt index 32201c54cd6..4c91f5e99ff 100644 --- a/packages/postgres-database/requirements/_tools.txt +++ b/packages/postgres-database/requirements/_tools.txt @@ -4,11 +4,9 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -41,6 +39,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -63,6 +62,10 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit wheel==0.36.2 diff --git a/packages/service-integration/requirements/_base.txt b/packages/service-integration/requirements/_base.txt index 91de340e782..bb2276863f5 100644 --- a/packages/service-integration/requirements/_base.txt +++ b/packages/service-integration/requirements/_base.txt @@ -16,7 +16,7 @@ click==8.0.1 # via -r requirements/_base.in dnspython==2.1.0 # via email-validator -docker==5.0.0 +docker==5.0.2 # via -r requirements/_base.in email-validator==1.1.3 # via pydantic @@ -44,7 +44,7 @@ pyparsing==2.4.7 # via packaging pyrsistent==0.18.0 # via jsonschema -pytest==6.2.4 +pytest==6.2.5 # via -r requirements/_base.in pyyaml==5.4.1 # via @@ -57,7 +57,7 @@ six==1.16.0 # via jsonschema toml==0.10.2 # via pytest -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via pydantic urllib3==1.26.6 # via diff --git a/packages/service-integration/requirements/_test.txt b/packages/service-integration/requirements/_test.txt index 959c6a43479..c71b8ff2a6c 100644 --- a/packages/service-integration/requirements/_test.txt +++ b/packages/service-integration/requirements/_test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in # -astroid==2.7.3 +astroid==2.8.0 # via pylint attrs==21.2.0 # via @@ -56,13 +56,13 @@ py==1.10.0 # via # -c requirements/_base.txt # pytest -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pyparsing==2.4.7 # via # -c requirements/_base.txt # packaging -pytest==6.2.4 +pytest==6.2.5 # via # -c requirements/_base.txt # -r requirements/_test.in @@ -89,6 +89,11 @@ toml==0.10.2 # pylint # pytest # pytest-cov +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt diff --git a/packages/service-integration/requirements/_tools.txt b/packages/service-integration/requirements/_tools.txt index ed57fca8ab3..0fda30382dc 100644 --- a/packages/service-integration/requirements/_tools.txt +++ b/packages/service-integration/requirements/_tools.txt @@ -4,11 +4,9 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -42,6 +40,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -65,6 +64,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit wheel==0.36.2 diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt index 9cfbc9e62f6..30ab7abbde4 100644 --- a/packages/service-library/requirements/_test.txt +++ b/packages/service-library/requirements/_test.txt @@ -9,7 +9,7 @@ aiohttp==3.7.4.post0 # -c requirements/../../../requirements/constraints.txt # -c requirements/_aiohttp.txt # pytest-aiohttp -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -100,7 +100,7 @@ py==1.10.0 # via pytest pycparser==2.20 # via cffi -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pynacl==1.4.0 # via paramiko @@ -168,6 +168,8 @@ typing-extensions==3.10.0.2 # -c requirements/_aiohttp.txt # -c requirements/_base.txt # aiohttp + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt diff --git a/packages/service-library/requirements/_tools.txt b/packages/service-library/requirements/_tools.txt index 9211ee57045..010eefbd12f 100644 --- a/packages/service-library/requirements/_tools.txt +++ b/packages/service-library/requirements/_tools.txt @@ -6,7 +6,7 @@ # backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.8b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt diff --git a/packages/service-library/tests/aiohttp/tutils.py b/packages/service-library/tests/aiohttp/tutils.py index 9527410ff47..34eca7c6612 100644 --- a/packages/service-library/tests/aiohttp/tutils.py +++ b/packages/service-library/tests/aiohttp/tutils.py @@ -1,6 +1,8 @@ # pylint: disable=redefined-outer-name # pylint: disable=unused-argument # pylint: disable=unused-import +# pylint: disable=no-self-use + import asyncio import json diff --git a/packages/settings-library/requirements/_base.txt b/packages/settings-library/requirements/_base.txt index 97bbb3cfe14..fc6eca5ca06 100644 --- a/packages/settings-library/requirements/_base.txt +++ b/packages/settings-library/requirements/_base.txt @@ -4,13 +4,13 @@ # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in # -click==7.1.2 +click==8.0.1 # via typer pydantic==1.8.2 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in -typer==0.3.2 +typer==0.4.0 # via -r requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via pydantic diff --git a/packages/settings-library/requirements/_test.txt b/packages/settings-library/requirements/_test.txt index 54883ed7c40..a2b80ba1124 100644 --- a/packages/settings-library/requirements/_test.txt +++ b/packages/settings-library/requirements/_test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in # -astroid==2.7.3 +astroid==2.8.0 # via pylint attrs==21.2.0 # via pytest @@ -41,11 +41,11 @@ pluggy==0.13.1 # via pytest py==1.10.0 # via pytest -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pyparsing==2.4.7 # via packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-cov @@ -73,6 +73,11 @@ toml==0.10.2 # pylint # pytest # pytest-cov +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt diff --git a/packages/settings-library/requirements/_tools.txt b/packages/settings-library/requirements/_tools.txt index ccabe887031..f21e2cfc5ab 100644 --- a/packages/settings-library/requirements/_tools.txt +++ b/packages/settings-library/requirements/_tools.txt @@ -4,17 +4,15 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt cfgv==3.3.0 # via pre-commit -click==7.1.2 +click==8.0.1 # via # -c requirements/_base.txt # black @@ -42,6 +40,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -61,6 +60,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit wheel==0.36.2 diff --git a/packages/settings-library/tests/test_cli_utils.py b/packages/settings-library/tests/test_cli_utils.py index 15bd87007af..db8ef66d19a 100644 --- a/packages/settings-library/tests/test_cli_utils.py +++ b/packages/settings-library/tests/test_cli_utils.py @@ -36,7 +36,7 @@ def run(): return main -def test_compose_commands(cli, cli_runner): +def test_compose_commands(cli: typer.Typer, cli_runner: CliRunner): result = cli_runner.invoke(cli, ["--help"]) print(result.stdout) assert result.exit_code == 0 @@ -66,16 +66,18 @@ def extract_lines(text): Resolves settings and prints envfile Options: - --as-json / --no-as-json [default: False] + --as-json / --no-as-json [default: no-as-json] --as-json-schema / --no-as-json-schema - [default: False] - --compact / --no-compact Print compact form [default: False] - --verbose / --no-verbose [default: False] + [default: no-as-json-schema] + --compact / --no-compact Print compact form [default: no-compact] + --verbose / --no-verbose [default: no-verbose] --help Show this message and exit. """ -def test_settings_as_json(cli, settings_cls, mock_environment, cli_runner): +def test_settings_as_json( + cli: typer.Typer, settings_cls, mock_environment, cli_runner: CliRunner +): result = cli_runner.invoke(cli, ["settings", "--as-json"]) print(result.stdout) @@ -85,7 +87,9 @@ def test_settings_as_json(cli, settings_cls, mock_environment, cli_runner): assert settings_cls.parse_obj(settings) -def test_settings_as_env_file(cli, settings_cls, mock_environment, cli_runner): +def test_settings_as_env_file( + cli: typer.Typer, settings_cls, mock_environment, cli_runner: CliRunner +): # ANE -> PC: this test will be left in place but the feature will # not be considered for parsing settings via Pudantic as there # is no out of the box support diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index a8d0cad00c1..c571bd49324 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -17,7 +17,7 @@ aiohttp==3.7.4.post0 # -r requirements/_base.in aiopg==1.3.1 # via -r requirements/_base.in -alembic==1.6.5 +alembic==1.7.3 # via -r requirements/../../../packages/postgres-database/requirements/_migration.in async-timeout==3.0.1 # via @@ -38,7 +38,7 @@ click==8.0.1 # via -r requirements/../../../packages/postgres-database/requirements/_migration.in dnspython==2.1.0 # via email-validator -docker==5.0.0 +docker==5.0.2 # via -r requirements/../../../packages/postgres-database/requirements/_migration.in email-validator==1.1.3 # via pydantic @@ -51,6 +51,13 @@ idna==2.10 # email-validator # requests # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # alembic mako==1.1.4 # via alembic markupsafe==2.0.1 @@ -83,10 +90,6 @@ pyinstrument==4.0.2 # via -r requirements/../../../packages/service-library/requirements/_base.in pyparsing==2.4.7 # via packaging -python-dateutil==2.8.2 - # via alembic -python-editor==1.0.4 - # via alembic pyyaml==5.4.1 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt @@ -98,9 +101,7 @@ pyyaml==5.4.1 requests==2.26.0 # via docker six==1.16.0 - # via - # python-dateutil - # websocket-client + # via websocket-client sqlalchemy==1.3.24 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt @@ -122,7 +123,7 @@ trafaret==2.1.0 # via trafaret-config trafaret-config==2.0.2 # via -r requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiohttp # pydantic @@ -145,3 +146,5 @@ yarl==1.6.3 # -c requirements/../../../packages/postgres-database/requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp +zipp==3.5.0 + # via importlib-resources diff --git a/packages/simcore-sdk/requirements/_test.txt b/packages/simcore-sdk/requirements/_test.txt index 281bc7eeb77..6539f962a8b 100644 --- a/packages/simcore-sdk/requirements/_test.txt +++ b/packages/simcore-sdk/requirements/_test.txt @@ -12,11 +12,11 @@ aiohttp==3.7.4.post0 # pytest-aiohttp aioresponses==0.7.2 # via -r requirements/_test.in -alembic==1.6.5 +alembic==1.7.3 # via # -c requirements/_base.txt # -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -47,7 +47,7 @@ coverage==5.5 # pytest-cov coveralls==3.2.0 # via -r requirements/_test.in -docker==5.0.0 +docker==5.0.2 # via # -c requirements/_base.txt # -r requirements/_test.in @@ -64,6 +64,11 @@ idna==2.10 # -c requirements/_base.txt # requests # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # alembic iniconfig==1.1.1 # via pytest isort==5.9.3 @@ -108,13 +113,13 @@ py==1.10.0 # via # pytest # pytest-forked -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pyparsing==2.4.7 # via # -c requirements/_base.txt # packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -144,16 +149,9 @@ pytest-sugar==0.9.4 pytest-xdist==2.3.0 # via -r requirements/_test.in python-dateutil==2.8.2 - # via - # -c requirements/_base.txt - # alembic - # faker + # via faker python-dotenv==0.19.0 # via -r requirements/_test.in -python-editor==1.0.4 - # via - # -c requirements/_base.txt - # alembic requests==2.26.0 # via # -c requirements/_base.txt @@ -179,10 +177,12 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # aiohttp + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt @@ -199,6 +199,10 @@ yarl==1.6.3 # via # -c requirements/_base.txt # aiohttp +zipp==3.5.0 + # via + # -c requirements/_base.txt + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/simcore-sdk/requirements/_tools.txt b/packages/simcore-sdk/requirements/_tools.txt index 62ec25fa547..9bda28f81e0 100644 --- a/packages/simcore-sdk/requirements/_tools.txt +++ b/packages/simcore-sdk/requirements/_tools.txt @@ -4,11 +4,9 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -42,6 +40,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -65,6 +64,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit wheel==0.36.2 diff --git a/packages/simcore-sdk/requirements/ci.txt b/packages/simcore-sdk/requirements/ci.txt index 73aa24c8d50..a6d404c4937 100644 --- a/packages/simcore-sdk/requirements/ci.txt +++ b/packages/simcore-sdk/requirements/ci.txt @@ -12,9 +12,11 @@ # installs this repo's packages ../postgres-database/[migration] -../service-library/ ../pytest-simcore/ ../models-library/ + +# FIXME: these dependencies should be removed +../service-library/ ../../services/storage/client-sdk/python/ # Needed ONLY for testing diff --git a/packages/simcore-sdk/requirements/dev.txt b/packages/simcore-sdk/requirements/dev.txt index 0f4f9648029..a8d8d609e7d 100644 --- a/packages/simcore-sdk/requirements/dev.txt +++ b/packages/simcore-sdk/requirements/dev.txt @@ -12,10 +12,13 @@ --requirement _tools.txt # installs this repo's packages ---editable ../postgres-database/[migration] ---editable ../service-library/ --editable ../pytest-simcore/ + +--editable ../postgres-database/[migration] --editable ../models-library/ + +# FIXME: these dependencies should be removed +--editable ../service-library/ ../../services/storage/client-sdk/python/ # Needed ONLY for testing # installs current package diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/dbmanager.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/dbmanager.py index 5350a1e9907..58d1cb453b0 100644 --- a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/dbmanager.py +++ b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/dbmanager.py @@ -57,7 +57,8 @@ def __init__(self, db_engine: Optional[aiopg.sa.Engine] = None): self._db_engine: Optional[aiopg.sa.Engine] = db_engine self._db_engine_created: bool = False - async def _create_db_engine(self) -> aiopg.sa.Engine: + @staticmethod + async def _create_db_engine() -> aiopg.sa.Engine: dsn = DataSourceName( application_name=f"{__name__}_{id(socket.gethostname())}", database=config.POSTGRES_DB, diff --git a/packages/simcore-sdk/tests/unit/test_node_ports_v2_port.py b/packages/simcore-sdk/tests/unit/test_node_ports_v2_port.py index bf9926d813b..87f03243de7 100644 --- a/packages/simcore-sdk/tests/unit/test_node_ports_v2_port.py +++ b/packages/simcore-sdk/tests/unit/test_node_ports_v2_port.py @@ -4,6 +4,8 @@ # pylint:disable=no-member # pylint:disable=protected-access # pylint:disable=too-many-arguments + + import re import shutil import tempfile @@ -540,7 +542,8 @@ class FakeNodePorts: project_id: str node_uuid: str - async def get(self, key): + @staticmethod + async def get(key): # this gets called when a node links to another node we return the get value but for files it needs to be a real one return ( another_node_file @@ -548,12 +551,12 @@ async def get(self, key): else exp_get_value ) - async def _node_ports_creator_cb(self, node_uuid: str): - return FakeNodePorts( - user_id=user_id, project_id=project_id, node_uuid=node_uuid - ) + @classmethod + async def _node_ports_creator_cb(cls, node_uuid: str) -> "FakeNodePorts": + return cls(user_id=user_id, project_id=project_id, node_uuid=node_uuid) - async def save_to_db_cb(self, node_ports): + @staticmethod + async def save_to_db_cb(node_ports): return fake_node_ports = FakeNodePorts( diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 30e01367f1e..8298d8e4f3b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -38,6 +38,8 @@ sqlalchemy<2.0 # FIXME: minio 7.1.0 does not delete objects. SEE minio==7.0.4 +# FIXME: auto-reload does not work +uvicorn<0.14.0 # # Compatibility/coordination diff --git a/requirements/tools/Makefile b/requirements/tools/Makefile index 37193c20688..d82415df190 100644 --- a/requirements/tools/Makefile +++ b/requirements/tools/Makefile @@ -32,8 +32,8 @@ MAKE_C := $(MAKE) --directory .PHONY: touch reqs info # requirements in packages and services -_compiled-all = $(shell find $(REPODIR) -path "*/requirements/*.txt") -_inputs-all = $(shell find $(REPODIR) -path "*/requirements/*.in") +_compiled-all = $(shell find $(REPODIR) -path "*/requirements*.txt") +_inputs-all = $(shell find $(REPODIR) -path "*/requirements*.in") # packages/ _target-inputs = $(shell find ${PACKAGES_DIR} -type f -name _base.in) @@ -65,11 +65,17 @@ touch: ## touches all package requirement inputs # Touchs all target input requirements @$(foreach p,${_target-inputs},touch $(p);) -reqs: ## updates requirements of all package libraries +reqs: ## updates test & tooling requirements # Upgrading $(upgrade) requirements @$(foreach p,${_target-inputs},echo Touching $(p);touch $(p);$(MAKE_C) $(dir $(p)) reqs $(UPGRADE_OPTION);) +reqs-all: guard-UPGRADE_OPTION ## updates a give package repository-wise (e.g. make reqs-all upgrade=foo==1.2.3 ) + # Upgrading $(upgrade) ALL requirements + @$(foreach p,${_inputs-all},echo Touching $(p);touch $(p);$(MAKE_C) $(dir $(p)) reqs $(UPGRADE_OPTION);) + + + IMAGE_NAME:=local/python-devkit:${PYTHON_VERSION} # SEE https://medium.com/faun/set-current-host-user-for-docker-container-4e521cef9ffc @@ -114,3 +120,8 @@ help: ## this colorful help @echo "" @awk --posix 'BEGIN {FS = ":.*?## "} /^[[:alpha:][:space:]_-]+:.*?## / {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) @echo "" + + +.PHONY: guard-% +guard-%: + @if [ "${${*}}" = "" ]; then echo "Environment variable $* not set"; exit 1; fi diff --git a/services/api-server/docker/boot.sh b/services/api-server/docker/boot.sh index 73681caaa33..d96a9273ff3 100755 --- a/services/api-server/docker/boot.sh +++ b/services/api-server/docker/boot.sh @@ -35,6 +35,5 @@ if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then --reload-dir services/api-server/src/simcore_service_api_server else exec uvicorn simcore_service_api_server.main:the_app \ - --host 0.0.0.0 \ - --reload-dir services/api-server/src/simcore_service_api_server + --host 0.0.0.0 fi diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index ede8c285712..c64d4344e69 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -22,29 +22,12 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in - # aiozipkin aiopg==1.2.1 # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -aiozipkin==0.7.1 - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -alembic==1.6.5 +alembic==1.7.3 # via -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in aniso8601==7.0.0 # via graphene @@ -58,13 +41,11 @@ async-timeout==3.0.1 # aiopg attrs==20.3.0 # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in # aiohttp - # jsonschema - # openapi-core certifi==2020.12.5 # via # httpx @@ -94,13 +75,13 @@ decorator==4.4.2 # via networkx dnspython==2.1.0 # via email-validator -docker==5.0.0 +docker==5.0.2 # via -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in email-validator==1.1.2 # via # fastapi # pydantic -fastapi==0.68.0 +fastapi==0.68.1 # via -r requirements/_base.in graphene==2.1.8 # via fastapi @@ -122,13 +103,13 @@ httpx==0.18.1 # via -r requirements/_base.in idna==2.10 # via + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # email-validator # requests # rfc3986 @@ -144,10 +125,7 @@ importlib-resources==5.1.3 ; python_version < "3.9" # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in -isodate==0.6.0 - # via - # openapi-core - # openapi-schema-validator + # alembic itsdangerous==1.1.0 # via fastapi jinja2==2.11.3 @@ -161,17 +139,6 @@ jinja2==2.11.3 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # fastapi -jsonschema==3.2.0 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-schema-validator - # openapi-spec-validator -lazy-object-proxy==1.4.3 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-core mako==1.1.4 # via alembic markupsafe==2.0.1 @@ -185,24 +152,12 @@ multidict==5.1.0 # yarl networkx==2.5.1 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -openapi-core==0.12.0 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -openapi-schema-validator==0.1.5 - # via openapi-spec-validator -openapi-spec-validator==0.3.1 - # via openapi-core orjson==3.5.2 # via fastapi packaging==20.9 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -prometheus-client==0.10.1 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in promise==2.3 # via # graphql-core @@ -210,8 +165,6 @@ promise==2.3 psycopg2-binary==2.9.1 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # aiopg # sqlalchemy @@ -242,16 +195,10 @@ pyinstrument-cext==0.2.4 # via pyinstrument pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 - # via jsonschema -python-dateutil==2.8.2 - # via alembic python-dotenv==0.17.1 # via # pydantic # uvicorn -python-editor==1.0.4 - # via alembic python-multipart==0.0.5 # via fastapi pyyaml==5.4.1 @@ -267,7 +214,6 @@ pyyaml==5.4.1 # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # fastapi - # openapi-spec-validator # trafaret-config # uvicorn requests==2.25.1 @@ -283,12 +229,6 @@ six==1.16.0 # graphene # graphql-core # graphql-relay - # isodate - # jsonschema - # openapi-core - # openapi-schema-validator - # openapi-spec-validator - # python-dateutil # python-multipart # tenacity # websocket-client @@ -308,15 +248,11 @@ sqlalchemy==1.3.24 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiopg # alembic starlette==0.14.2 # via fastapi -strict-rfc3339==0.7 - # via openapi-core tenacity==7.0.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in @@ -327,13 +263,10 @@ tenacity==7.0.0 tqdm==4.60.0 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in trafaret==2.1.0 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # trafaret-config + # via trafaret-config trafaret-config==2.0.2 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiohttp # pydantic @@ -355,7 +288,16 @@ urllib3==1.26.5 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # requests uvicorn==0.13.4 - # via fastapi + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # fastapi uvloop==0.14.0 # via uvicorn watchgod==0.7 @@ -366,16 +308,9 @@ websocket-client==0.59.0 # docker websockets==8.1 # via uvicorn -werkzeug==2.0.1 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in yarl==1.6.3 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index fbe8377dc56..f48eb11b5ab 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -4,13 +4,13 @@ # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in # -alembic==1.6.5 +alembic==1.7.3 # via # -c requirements/_base.txt # -r requirements/_test.in asgi-lifespan==1.0.1 # via -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint attrs==20.3.0 # via @@ -58,7 +58,7 @@ cryptography==3.4.7 # paramiko distro==1.6.0 # via docker-compose -docker==5.0.0 +docker==5.0.2 # via # -c requirements/_base.txt # -r requirements/_test.in @@ -95,18 +95,20 @@ idna==2.10 # requests # rfc3986 # yarl +importlib-resources==5.1.3 ; python_version < "3.9" + # via + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # alembic iniconfig==1.1.1 # via pytest isort==5.9.3 # via pylint jsonschema==3.2.0 - # via - # -c requirements/_base.txt - # docker-compose + # via docker-compose lazy-object-proxy==1.4.3 - # via - # -c requirements/_base.txt - # astroid + # via astroid mako==1.1.4 # via # -c requirements/_base.txt @@ -143,7 +145,7 @@ pycparser==2.20 # via # -c requirements/_base.txt # cffi -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pynacl==1.4.0 # via paramiko @@ -152,10 +154,8 @@ pyparsing==2.4.7 # -c requirements/_base.txt # packaging pyrsistent==0.17.3 - # via - # -c requirements/_base.txt - # jsonschema -pytest==6.2.4 + # via jsonschema +pytest==6.2.5 # via # -r requirements/_test.in # pytest-asyncio @@ -173,18 +173,11 @@ pytest-mock==3.6.1 pytest-runner==5.3.1 # via -r requirements/_test.in python-dateutil==2.8.2 - # via - # -c requirements/_base.txt - # alembic - # faker + # via faker python-dotenv==0.17.1 # via # -c requirements/_base.txt # docker-compose -python-editor==1.0.4 - # via - # -c requirements/_base.txt - # alembic pyyaml==5.4.1 # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -240,6 +233,11 @@ toml==0.10.2 # pylint # pytest # pytest-cov +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # astroid + # pylint urllib3==1.26.5 # via # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index d4a5996e30a..ad0bcd78608 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -57,6 +55,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -84,6 +83,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3 diff --git a/services/catalog/docker/boot.sh b/services/catalog/docker/boot.sh index 1945cc43f5f..94dc5840957 100755 --- a/services/catalog/docker/boot.sh +++ b/services/catalog/docker/boot.sh @@ -35,6 +35,5 @@ if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then --reload-dir services/catalog/src/simcore_service_catalog else exec uvicorn simcore_service_catalog.main:the_app \ - --host 0.0.0.0 \ - --reload-dir services/catalog/src/simcore_service_catalog + --host 0.0.0.0 fi diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index a0757aa1070..6f406f0c4dc 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -30,7 +30,7 @@ email-validator==1.1.2 # via # fastapi # pydantic -fastapi==0.68.0 +fastapi==0.68.1 # via -r requirements/_base.in graphene==2.1.8 # via fastapi @@ -134,7 +134,7 @@ starlette==0.14.2 # via fastapi tenacity==6.3.1 # via -r requirements/_base.in -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via pydantic ujson==4.0.2 # via fastapi @@ -144,8 +144,12 @@ urllib3==1.26.5 # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # requests -uvicorn==0.13.3 - # via fastapi +uvicorn==0.13.4 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # fastapi uvloop==0.14.0 # via uvicorn watchgod==0.6 diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index 82b636bc495..6516bba01dc 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -8,9 +8,9 @@ aiohttp==3.7.4.post0 # via # -c requirements/../../../requirements/constraints.txt # pytest-aiohttp -alembic==1.6.5 +alembic==1.7.3 # via -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -58,7 +58,7 @@ cryptography==3.4.7 # paramiko distro==1.6.0 # via docker-compose -docker==5.0.0 +docker==5.0.2 # via # -r requirements/_test.in # docker-compose @@ -92,6 +92,10 @@ idna==2.10 # requests # rfc3986 # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../requirements/constraints.txt + # alembic iniconfig==1.1.1 # via pytest isort==5.9.3 @@ -135,7 +139,7 @@ py==1.10.0 # via pytest pycparser==2.20 # via cffi -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pynacl==1.4.0 # via paramiko @@ -145,7 +149,7 @@ pyparsing==2.4.7 # packaging pyrsistent==0.18.0 # via jsonschema -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -163,15 +167,11 @@ pytest-mock==3.6.1 pytest-runner==5.3.1 # via -r requirements/_test.in python-dateutil==2.8.2 - # via - # alembic - # faker + # via faker python-dotenv==0.15.0 # via # -c requirements/_base.txt # docker-compose -python-editor==1.0.4 - # via alembic pyyaml==5.4.1 # via # -c requirements/../../../requirements/constraints.txt @@ -218,10 +218,12 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # aiohttp + # astroid + # pylint urllib3==1.26.5 # via # -c requirements/../../../requirements/constraints.txt @@ -237,6 +239,8 @@ yarl==1.6.3 # via # -c requirements/_base.txt # aiohttp +zipp==3.5.0 + # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/catalog/requirements/_tools.txt b/services/catalog/requirements/_tools.txt index 3a1d62fb807..c14ccacc762 100644 --- a/services/catalog/requirements/_tools.txt +++ b/services/catalog/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -45,6 +43,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -69,6 +68,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3 diff --git a/services/catalog/tests/unit/with_dbs/conftest.py b/services/catalog/tests/unit/with_dbs/conftest.py index e23819d24e2..745aa7daf9a 100644 --- a/services/catalog/tests/unit/with_dbs/conftest.py +++ b/services/catalog/tests/unit/with_dbs/conftest.py @@ -40,7 +40,8 @@ def client(app: FastAPI) -> TestClient: @pytest.fixture() async def director_mockup(loop, app: FastAPI): class FakeDirector: - async def get(self, url: str): + @staticmethod + async def get(url: str): return "" app.dependency_overrides[get_director_api] = FakeDirector diff --git a/services/catalog/tests/unit/with_dbs/test_entrypoint_services.py b/services/catalog/tests/unit/with_dbs/test_entrypoint_services.py index 03d823c2570..07b0c0dd5a4 100644 --- a/services/catalog/tests/unit/with_dbs/test_entrypoint_services.py +++ b/services/catalog/tests/unit/with_dbs/test_entrypoint_services.py @@ -108,7 +108,8 @@ async def return_list_services(user_id: int) -> List[ServiceOut]: monkeypatch.setattr(services, "list_services", return_list_services) class FakeDirector: - async def get(self, url: str): + @staticmethod + async def get(url: str): if url == "/services": return [s.dict(by_alias=True) for s in registry_services] if "/service_extras/" in url: diff --git a/services/dask-sidecar/requirements/_base.in b/services/dask-sidecar/requirements/_base.in index fe400336590..7c3c758f3ca 100644 --- a/services/dask-sidecar/requirements/_base.in +++ b/services/dask-sidecar/requirements/_base.in @@ -15,6 +15,8 @@ --constraint ../../../packages/postgres-database/requirements/_base.in --constraint ../../../packages/service-library/requirements/_base.in --constraint ../../../packages/simcore-sdk/requirements/_base.in + +# WARNING: this keeps compatibility with sidecar service requirements --constraint ../../../services/sidecar/requirements/_base.txt aiodocker diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt index 10aa4e3ec7d..fc37531c6fa 100644 --- a/services/dask-sidecar/requirements/_base.txt +++ b/services/dask-sidecar/requirements/_base.txt @@ -18,7 +18,6 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -27,31 +26,9 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/simcore-sdk/requirements/_base.in # -c requirements/../../../requirements/constraints.txt # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiodocker - # aiozipkin # jupyter-server-proxy -aiopg==1.2.1 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../packages/simcore-sdk/requirements/_base.in - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -aiozipkin==0.7.1 - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -alembic==1.6.5 +alembic==1.7.3 # via # -c requirements/../../../services/sidecar/requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in @@ -65,16 +42,14 @@ async-timeout==3.0.1 # via # -c requirements/../../../services/sidecar/requirements/_base.txt # aiohttp - # aiopg attrs==20.2.0 # via - # -c requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/_base.in # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiohttp # jsonschema - # openapi-core bleach==3.3.0 # via nbconvert blosc==1.10.4 @@ -115,7 +90,7 @@ dnspython==2.0.0 # via # -c requirements/../../../services/sidecar/requirements/_base.txt # email-validator -docker==5.0.0 +docker==5.0.2 # via # -c requirements/../../../services/sidecar/requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in @@ -133,26 +108,34 @@ idna==2.10 # via # -c requirements/../../../packages/models-library/requirements/_base.in # -c requirements/../../../packages/postgres-database/requirements/_base.in - # -c requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../services/sidecar/requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # anyio # email-validator # requests # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -c requirements/../../../services/sidecar/requirements/_base.txt + # alembic ipython-genutils==0.2.0 # via # jupyter-server # nbformat # traitlets -isodate==0.6.0 - # via - # -c requirements/../../../services/sidecar/requirements/_base.txt - # openapi-core - # openapi-schema-validator jinja2==3.0.1 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt @@ -168,13 +151,7 @@ jinja2==3.0.1 # jupyter-server # nbconvert jsonschema==3.2.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # nbformat - # openapi-schema-validator - # openapi-spec-validator + # via nbformat jupyter-client==6.1.12 # via # jupyter-server @@ -191,12 +168,6 @@ jupyter-server-proxy==3.0.2 # via -r requirements/_base.in jupyterlab-pygments==0.1.2 # via nbconvert -lazy-object-proxy==1.4.3 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-core locket==0.2.1 # via partd lz4==3.1.3 @@ -237,19 +208,6 @@ numpy==1.20.3 # bokeh # dask # pandas -openapi-core==0.12.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -openapi-schema-validator==0.1.5 - # via - # -c requirements/../../../services/sidecar/requirements/_base.txt - # openapi-spec-validator -openapi-spec-validator==0.3.1 - # via - # -c requirements/../../../services/sidecar/requirements/_base.txt - # openapi-core packaging==20.4 # via # -c requirements/../../../packages/simcore-sdk/requirements/_base.in @@ -266,22 +224,15 @@ partd==1.2.0 # via dask pillow==8.2.0 # via bokeh -prometheus_client==0.11.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # jupyter-server +prometheus-client==0.11.0 + # via jupyter-server psutil==5.8.0 # via distributed psycopg2-binary==2.9.1 # via - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt # -c requirements/../../../packages/simcore-sdk/requirements/_base.in # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # aiopg # sqlalchemy ptyprocess==0.7.0 # via terminado @@ -323,20 +274,12 @@ pyparsing==2.4.7 # -c requirements/../../../services/sidecar/requirements/_base.txt # packaging pyrsistent==0.17.3 - # via - # -c requirements/../../../services/sidecar/requirements/_base.txt - # jsonschema + # via jsonschema python-dateutil==2.8.1 # via - # -c requirements/../../../services/sidecar/requirements/_base.txt - # alembic # bokeh # jupyter-client # pandas -python-editor==1.0.4 - # via - # -c requirements/../../../services/sidecar/requirements/_base.txt - # alembic pytz==2020.1 # via # -c requirements/../../../services/sidecar/requirements/_base.txt @@ -358,7 +301,6 @@ pyyaml==5.4.1 # bokeh # dask # distributed - # openapi-spec-validator pyzmq==22.1.0 # via # jupyter-client @@ -376,11 +318,7 @@ six==1.15.0 # -c requirements/../../../services/sidecar/requirements/_base.txt # argon2-cffi # bleach - # isodate # jsonschema - # openapi-core - # openapi-schema-validator - # openapi-spec-validator # packaging # python-dateutil # tenacity @@ -395,7 +333,6 @@ sqlalchemy==1.3.24 # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/_base.in # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -405,13 +342,7 @@ sqlalchemy==1.3.24 # -c requirements/../../../requirements/constraints.txt # -c requirements/../../../services/sidecar/requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # aiopg # alembic -strict-rfc3339==0.7 - # via - # -c requirements/../../../services/sidecar/requirements/_base.txt - # openapi-core tblib==1.7.0 # via distributed tenacity==6.2.0 @@ -438,11 +369,6 @@ tornado==6.1 # jupyter-client # jupyter-server # terminado -trafaret==2.1.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in traitlets==5.0.5 # via # jupyter-client @@ -451,7 +377,7 @@ traitlets==5.0.5 # nbclient # nbconvert # nbformat -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # -c requirements/../../../services/sidecar/requirements/_base.txt # aiodocker @@ -485,11 +411,6 @@ websocket-client==0.59.0 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # docker # jupyter-server -werkzeug==2.0.1 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../services/sidecar/requirements/_base.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in yarl==1.6.3 # via # -c requirements/../../../packages/postgres-database/requirements/_base.in @@ -499,6 +420,10 @@ yarl==1.6.3 # aiohttp zict==2.0.0 # via distributed +zipp==3.5.0 + # via + # -c requirements/../../../services/sidecar/requirements/_base.txt + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/dask-sidecar/requirements/_dask-complete.txt b/services/dask-sidecar/requirements/_dask-complete.txt index 37feae77e37..ff5e8ae6bec 100644 --- a/services/dask-sidecar/requirements/_dask-complete.txt +++ b/services/dask-sidecar/requirements/_dask-complete.txt @@ -119,7 +119,7 @@ tornado==6.1 # -c requirements/./_base.txt # bokeh # distributed -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # -c requirements/./_base.txt # bokeh diff --git a/services/dask-sidecar/requirements/_packages.txt b/services/dask-sidecar/requirements/_packages.txt index 023727349d1..0c09aa43630 100644 --- a/services/dask-sidecar/requirements/_packages.txt +++ b/services/dask-sidecar/requirements/_packages.txt @@ -33,17 +33,11 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt # aiodocker - # aiozipkin aiopg==1.2.1 # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt aioredis==1.3.1 @@ -64,26 +58,12 @@ aiormq==3.2.3 # via # -r requirements/../../../services/sidecar/requirements/_base.txt # aio-pika -aiozipkin==0.7.1 - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../services/sidecar/requirements/_base.txt -alembic==1.6.5 +alembic==1.7.3 # via # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # -r requirements/../../../services/sidecar/requirements/_base.txt -amqp==2.6.1 +amqp==5.0.6 # via # -r requirements/../../../services/sidecar/requirements/_base.txt # kombu @@ -96,16 +76,14 @@ async-timeout==3.0.1 # aioredis attrs==20.2.0 # via + # -c requirements/../../../packages/service-library/requirements/./constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt # aiohttp # aioredlock - # jsonschema - # openapi-core -billiard==3.6.3.0 +billiard==3.6.4.0 # via # -r requirements/../../../services/sidecar/requirements/_base.txt # celery @@ -113,7 +91,7 @@ caio==0.6.1 # via # -r requirements/../../../services/sidecar/requirements/_base.txt # aiofile -celery==4.4.7 +celery==5.1.2 # via -r requirements/../../../services/sidecar/requirements/_base.txt certifi==2021.5.30 # via @@ -131,6 +109,22 @@ click==7.1.2 # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # -r requirements/../../../services/sidecar/requirements/_base.txt + # celery + # click-didyoumean + # click-plugins + # click-repl +click-didyoumean==0.0.3 + # via + # -r requirements/../../../services/sidecar/requirements/_base.txt + # celery +click-plugins==1.1.1 + # via + # -r requirements/../../../services/sidecar/requirements/_base.txt + # celery +click-repl==0.2.0 + # via + # -r requirements/../../../services/sidecar/requirements/_base.txt + # celery decorator==4.4.2 # via # -r requirements/../../../services/sidecar/requirements/_base.txt @@ -140,7 +134,7 @@ dnspython==2.0.0 # -c requirements/_base.txt # -r requirements/../../../services/sidecar/requirements/_base.txt # email-validator -docker==5.0.0 +docker==5.0.2 # via # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in @@ -156,43 +150,35 @@ hiredis==1.1.0 # aioredis idna==2.10 # via + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/_base.txt # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt # email-validator # requests # yarl -isodate==0.6.0 - # via - # -c requirements/_base.txt - # -r requirements/../../../services/sidecar/requirements/_base.txt - # openapi-core - # openapi-schema-validator -jsonschema==3.2.0 +importlib-resources==5.2.2 ; python_version < "3.9" # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt - # openapi-schema-validator - # openapi-spec-validator -kombu==4.6.11 + # alembic +kombu==5.1.0 # via # -r requirements/../../../services/sidecar/requirements/_base.txt # celery -lazy-object-proxy==1.4.3 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../services/sidecar/requirements/_base.txt - # openapi-core mako==1.1.4 # via # -c requirements/_base.txt @@ -214,22 +200,6 @@ networkx==2.5 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt -openapi-core==0.12.0 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../services/sidecar/requirements/_base.txt -openapi-schema-validator==0.1.5 - # via - # -c requirements/_base.txt - # -r requirements/../../../services/sidecar/requirements/_base.txt - # openapi-spec-validator -openapi-spec-validator==0.3.1 - # via - # -c requirements/_base.txt - # -r requirements/../../../services/sidecar/requirements/_base.txt - # openapi-core packaging==20.4 # via # -c requirements/_base.txt @@ -239,18 +209,14 @@ pamqp==2.3.0 # via # -r requirements/../../../services/sidecar/requirements/_base.txt # aiormq -prometheus_client==0.11.0 +prompt-toolkit==3.0.20 # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt + # click-repl psycopg2-binary==2.9.1 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt # aiopg @@ -288,21 +254,6 @@ pyparsing==2.4.7 # -c requirements/_base.txt # -r requirements/../../../services/sidecar/requirements/_base.txt # packaging -pyrsistent==0.17.3 - # via - # -c requirements/_base.txt - # -r requirements/../../../services/sidecar/requirements/_base.txt - # jsonschema -python-dateutil==2.8.1 - # via - # -c requirements/_base.txt - # -r requirements/../../../services/sidecar/requirements/_base.txt - # alembic -python-editor==1.0.4 - # via - # -c requirements/_base.txt - # -r requirements/../../../services/sidecar/requirements/_base.txt - # alembic pytz==2020.1 # via # -c requirements/_base.txt @@ -322,7 +273,6 @@ pyyaml==5.4.1 # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt - # openapi-spec-validator # trafaret-config redis==3.5.3 # via -r requirements/../../../services/sidecar/requirements/_base.txt @@ -335,13 +285,8 @@ six==1.15.0 # via # -c requirements/_base.txt # -r requirements/../../../services/sidecar/requirements/_base.txt - # isodate - # jsonschema - # openapi-core - # openapi-schema-validator - # openapi-spec-validator + # click-repl # packaging - # python-dateutil # tenacity # websocket-client sqlalchemy==1.3.24 @@ -357,17 +302,10 @@ sqlalchemy==1.3.24 # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../services/sidecar/requirements/_base.txt # aiopg # alembic -strict-rfc3339==0.7 - # via - # -c requirements/_base.txt - # -r requirements/../../../services/sidecar/requirements/_base.txt - # openapi-core tenacity==6.2.0 # via # -c requirements/_base.txt @@ -379,15 +317,10 @@ tenacity==6.2.0 tqdm==4.61.1 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in trafaret==2.1.0 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../services/sidecar/requirements/_base.txt - # trafaret-config + # via trafaret-config trafaret-config==2.0.2 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -r requirements/../../../services/sidecar/requirements/_base.txt @@ -414,23 +347,22 @@ urllib3==1.26.5 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # -r requirements/../../../services/sidecar/requirements/_base.txt # requests -vine==1.3.0 +vine==5.0.0 # via # -r requirements/../../../services/sidecar/requirements/_base.txt # amqp # celery + # kombu +wcwidth==0.2.5 + # via + # -r requirements/../../../services/sidecar/requirements/_base.txt + # prompt-toolkit websocket-client==0.59.0 # via # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # -r requirements/../../../services/sidecar/requirements/_base.txt # docker -werkzeug==2.0.1 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../services/sidecar/requirements/_base.txt yarl==1.6.3 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt @@ -441,6 +373,11 @@ yarl==1.6.3 # aio-pika # aiohttp # aiormq +zipp==3.5.0 + # via + # -c requirements/_base.txt + # -r requirements/../../../services/sidecar/requirements/_base.txt + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/dask-sidecar/requirements/_test.txt b/services/dask-sidecar/requirements/_test.txt index a2c4f3f9c49..3220e94522b 100644 --- a/services/dask-sidecar/requirements/_test.txt +++ b/services/dask-sidecar/requirements/_test.txt @@ -12,15 +12,14 @@ aiohttp==3.7.4.post0 # pytest-aiohttp aiopg==1.2.1 # via - # -c requirements/_base.txt # -c requirements/_packages.txt # -r requirements/_test.in -alembic==1.6.5 +alembic==1.7.3 # via # -c requirements/_base.txt # -c requirements/_packages.txt # -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -53,7 +52,7 @@ coverage==5.5 # pytest-cov coveralls==3.2.0 # via -r requirements/_test.in -docker==5.0.0 +docker==5.0.2 # via # -c requirements/_base.txt # -c requirements/_packages.txt @@ -70,15 +69,18 @@ idna==2.10 # -c requirements/_packages.txt # requests # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_packages.txt + # alembic iniconfig==1.1.1 # via pytest isort==5.9.3 # via pylint lazy-object-proxy==1.4.3 - # via - # -c requirements/_base.txt - # -c requirements/_packages.txt - # astroid + # via astroid mako==1.1.4 # via # -c requirements/_base.txt @@ -123,14 +125,14 @@ ptvsd==4.3.2 # via -r requirements/_test.in py==1.10.0 # via pytest -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pyparsing==2.4.7 # via # -c requirements/_base.txt # -c requirements/_packages.txt # packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -157,16 +159,9 @@ pytest-sugar==0.9.4 python-dateutil==2.8.1 # via # -c requirements/_base.txt - # -c requirements/_packages.txt - # alembic # faker python-dotenv==0.19.0 # via -r requirements/_test.in -python-editor==1.0.4 - # via - # -c requirements/_base.txt - # -c requirements/_packages.txt - # alembic requests==2.25.1 # via # -c requirements/_base.txt @@ -195,11 +190,13 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -c requirements/_packages.txt # aiohttp + # astroid + # pylint urllib3==1.26.5 # via # -c requirements/../../../requirements/constraints.txt @@ -219,6 +216,11 @@ yarl==1.6.3 # -c requirements/_base.txt # -c requirements/_packages.txt # aiohttp +zipp==3.5.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/dask-sidecar/requirements/_tools.txt b/services/dask-sidecar/requirements/_tools.txt index 98ab26935a5..1c496ebb59d 100644 --- a/services/dask-sidecar/requirements/_tools.txt +++ b/services/dask-sidecar/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -45,6 +43,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -71,6 +70,12 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3 diff --git a/services/datcore-adapter/docker/boot.sh b/services/datcore-adapter/docker/boot.sh index 89133a0c8ec..85216528498 100755 --- a/services/datcore-adapter/docker/boot.sh +++ b/services/datcore-adapter/docker/boot.sh @@ -42,6 +42,5 @@ if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then --reload-dir services/datcore-adapter/src/simcore_service_datcore_adapter else exec uvicorn simcore_service_datcore_adapter.main:the_app \ - --host 0.0.0.0 \ - --reload-dir services/datcore-adapter/src/simcore_service_datcore_adapter + --host 0.0.0.0 fi diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt index de4b047725c..f7c0871b35c 100644 --- a/services/datcore-adapter/requirements/_base.txt +++ b/services/datcore-adapter/requirements/_base.txt @@ -8,8 +8,6 @@ aiofiles==0.7.0 # via -r requirements/_base.in anyio==3.2.1 # via httpcore -asgiref==3.4.1 - # via uvicorn boto3==1.17.104 # via pennsieve botocore==1.20.104 @@ -38,7 +36,7 @@ ecdsa==0.14.1 # via python-jose email-validator==1.1.3 # via pydantic -fastapi==0.68.0 +fastapi==0.68.1 # via # -r requirements/_base.in # fastapi-pagination @@ -58,7 +56,7 @@ hpack==3.0.0 # via h2 httpcore==0.13.6 # via httpx -httptools==0.2.0 +httptools==0.1.2 # via uvicorn httpx==0.18.2 # via -r requirements/_base.in @@ -139,9 +137,9 @@ sniffio==1.2.0 # httpx starlette==0.14.2 # via fastapi -typer==0.3.2 +typer==0.4.0 # via -r requirements/../../../packages/settings-library/requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # fastapi-pagination # pydantic @@ -152,15 +150,19 @@ urllib3==1.26.6 # -c requirements/../../../requirements/constraints.txt # botocore # requests -uvicorn==0.14.0 - # via -r requirements/_base.in +uvicorn==0.13.4 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in uvloop==0.15.2 # via uvicorn watchgod==0.7 # via uvicorn websocket-client==1.1.0 # via pennsieve -websockets==9.1 +websockets==8.1 # via uvicorn wrapt==1.12.1 # via deprecated diff --git a/services/datcore-adapter/requirements/_test.txt b/services/datcore-adapter/requirements/_test.txt index 728524d7018..9c8857023a6 100644 --- a/services/datcore-adapter/requirements/_test.txt +++ b/services/datcore-adapter/requirements/_test.txt @@ -10,7 +10,7 @@ anyio==3.2.1 # httpcore asgi-lifespan==1.0.1 # via -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint attrs==21.2.0 # via pytest @@ -83,11 +83,11 @@ py==1.10.0 # via # pytest # pytest-forked -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pyparsing==2.4.7 # via packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-asyncio @@ -151,6 +151,11 @@ toml==0.10.2 # pylint # pytest # pytest-cov +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt diff --git a/services/datcore-adapter/requirements/_tools.txt b/services/datcore-adapter/requirements/_tools.txt index a2193fce10d..d8ba0b39363 100644 --- a/services/datcore-adapter/requirements/_tools.txt +++ b/services/datcore-adapter/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -44,6 +42,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -68,6 +67,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3 diff --git a/services/datcore-adapter/src/simcore_service_datcore_adapter/meta.py b/services/datcore-adapter/src/simcore_service_datcore_adapter/meta.py index ae69aa32f23..06a92e0eaab 100644 --- a/services/datcore-adapter/src/simcore_service_datcore_adapter/meta.py +++ b/services/datcore-adapter/src/simcore_service_datcore_adapter/meta.py @@ -23,6 +23,7 @@ def get_summary() -> str: metadata = current_distribution.get_metadata_lines("PKG-INFO") return next(x.split(":") for x in metadata if x.startswith("Summary:"))[-1] + return "" summary: str = get_summary() diff --git a/services/datcore-adapter/src/simcore_service_datcore_adapter/modules/pennsieve.py b/services/datcore-adapter/src/simcore_service_datcore_adapter/modules/pennsieve.py index db4b8fb9a4f..83caf7c3655 100644 --- a/services/datcore-adapter/src/simcore_service_datcore_adapter/modules/pennsieve.py +++ b/services/datcore-adapter/src/simcore_service_datcore_adapter/modules/pennsieve.py @@ -357,8 +357,8 @@ async def delete_object(self, api_key: str, api_secret: str, obj_id: str) -> Non ), ) + @staticmethod async def upload_file( - self, api_key: str, api_secret: str, file: Path, diff --git a/services/director-v2/docker/boot.sh b/services/director-v2/docker/boot.sh index e6c5fa80c74..f4cab3bb4bb 100755 --- a/services/director-v2/docker/boot.sh +++ b/services/director-v2/docker/boot.sh @@ -42,6 +42,5 @@ if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then --reload-dir services/director-v2/src/simcore_service_director_v2 else exec uvicorn simcore_service_director_v2.main:the_app \ - --host 0.0.0.0 \ - --reload-dir services/director-v2/src/simcore_service_director_v2 + --host 0.0.0.0 fi diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index b990527a1ec..c169788a2eb 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -35,7 +35,7 @@ attrs==21.2.0 # via aiohttp billiard==3.6.4.0 # via celery -celery==5.0.2 +celery==5.1.2 # via -r requirements/_base.in certifi==2021.5.30 # via @@ -50,12 +50,15 @@ click==7.1.2 # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # celery # click-didyoumean + # click-plugins # click-repl # distributed # typer # uvicorn click-didyoumean==0.0.3 # via celery +click-plugins==1.1.1 + # via celery click-repl==0.1.6 # via celery cloudpickle==1.6.0 @@ -77,7 +80,7 @@ email-validator==1.1.3 # via # fastapi # pydantic -fastapi==0.68.0 +fastapi==0.68.1 # via -r requirements/_base.in fsspec==2021.6.0 # via @@ -243,9 +246,9 @@ tornado==6.1 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed -typer==0.3.2 +typer==0.4.0 # via -r requirements/../../../packages/settings-library/requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiodocker # aiohttp @@ -260,7 +263,12 @@ urllib3==1.26.6 # -c requirements/../../../requirements/constraints.txt # requests uvicorn==0.13.4 - # via fastapi + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # fastapi uvloop==0.15.2 # via uvicorn vine==5.0.0 diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index 3d274cd9ba0..e25952844ff 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -17,7 +17,7 @@ aioredis==1.3.1 # -r requirements/_test.in aiormq==3.3.1 # via aio-pika -alembic==1.6.5 +alembic==1.7.3 # via -r requirements/_test.in amqp==5.0.6 # via @@ -29,7 +29,7 @@ anyio==3.2.1 # httpcore asgi-lifespan==1.0.1 # via -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint async-asgi-testclient==1.4.6 # via -r requirements/_test.in @@ -51,7 +51,7 @@ billiard==3.6.4.0 # via # -c requirements/_base.txt # celery -celery==5.0.2 +celery==5.1.2 # via # -c requirements/_base.txt # pytest-celery @@ -75,11 +75,16 @@ click==7.1.2 # -c requirements/_base.txt # celery # click-didyoumean + # click-plugins # click-repl click-didyoumean==0.0.3 # via # -c requirements/_base.txt # celery +click-plugins==1.1.1 + # via + # -c requirements/_base.txt + # celery click-repl==0.1.6 # via # -c requirements/_base.txt @@ -99,7 +104,7 @@ cryptography==3.4.7 # paramiko distro==1.6.0 # via docker-compose -docker==5.0.0 +docker==5.0.2 # via # -r requirements/_test.in # docker-compose @@ -140,6 +145,10 @@ idna==2.10 # requests # rfc3986 # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../requirements/constraints.txt + # alembic iniconfig==1.1.1 # via pytest isort==5.9.3 @@ -196,7 +205,7 @@ py==1.10.0 # pytest-forked pycparser==2.20 # via cffi -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pynacl==1.4.0 # via paramiko @@ -204,7 +213,7 @@ pyparsing==2.4.7 # via packaging pyrsistent==0.18.0 # via jsonschema -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -236,15 +245,11 @@ pytest-runner==5.3.1 pytest-xdist==2.3.0 # via -r requirements/_test.in python-dateutil==2.8.2 - # via - # alembic - # faker + # via faker python-dotenv==0.18.0 # via # -c requirements/_base.txt # docker-compose -python-editor==1.0.4 - # via alembic pytz==2021.1 # via # -c requirements/_base.txt @@ -299,10 +304,12 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # aiohttp + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt @@ -330,6 +337,8 @@ yarl==1.6.3 # aio-pika # aiohttp # aiormq +zipp==3.5.0 + # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/director-v2/requirements/_tools.txt b/services/director-v2/requirements/_tools.txt index f8a0e4d66c6..d89d7bd7ab1 100644 --- a/services/director-v2/requirements/_tools.txt +++ b/services/director-v2/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -45,6 +43,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -70,6 +69,11 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3 diff --git a/services/dynamic-sidecar/docker/boot.sh b/services/dynamic-sidecar/docker/boot.sh index ac748bac4e2..01bb921d868 100755 --- a/services/dynamic-sidecar/docker/boot.sh +++ b/services/dynamic-sidecar/docker/boot.sh @@ -35,6 +35,5 @@ if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then --reload-dir services/dynamic-sidecar/src/simcore_service_dynamic_sidecar else exec uvicorn simcore_service_dynamic_sidecar.main:app \ - --host 0.0.0.0 \ - --reload-dir services/dynamic-sidecar/src/simcore_service_dynamic_sidecar + --host 0.0.0.0 fi diff --git a/services/dynamic-sidecar/requirements/_base.txt b/services/dynamic-sidecar/requirements/_base.txt index 9a34f1be690..8399a5109d4 100644 --- a/services/dynamic-sidecar/requirements/_base.txt +++ b/services/dynamic-sidecar/requirements/_base.txt @@ -15,8 +15,6 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # aiodocker -asgiref==3.4.0 - # via uvicorn async-generator==1.10 # via -r requirements/_base.in async-timeout==3.0.1 @@ -55,7 +53,7 @@ distro==1.5.0 # via docker-compose dnspython==2.1.0 # via email-validator -docker==5.0.0 +docker==5.0.2 # via docker-compose docker-compose==1.29.1 # via @@ -70,7 +68,7 @@ docopt==0.6.2 # via docker-compose email-validator==1.1.3 # via pydantic -fastapi==0.68.0 +fastapi==0.68.1 # via -r requirements/_base.in h11==0.12.0 # via uvicorn @@ -139,9 +137,9 @@ starlette==0.14.2 # via fastapi texttable==1.6.3 # via docker-compose -typer==0.3.2 +typer==0.4.0 # via -r requirements/../../../packages/settings-library/requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiodocker # aiohttp @@ -153,8 +151,13 @@ urllib3==1.26.6 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # requests -uvicorn==0.14.0 - # via -r requirements/_base.in +uvicorn==0.13.4 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in websocket-client==0.59.0 # via # docker diff --git a/services/dynamic-sidecar/requirements/_tools.txt b/services/dynamic-sidecar/requirements/_tools.txt index fe893181900..dbff5931bcc 100644 --- a/services/dynamic-sidecar/requirements/_tools.txt +++ b/services/dynamic-sidecar/requirements/_tools.txt @@ -4,11 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -astroid==2.7.3 +astroid==2.8.0 # via pylint backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.8b0 +black==21.9b0 # via # -r requirements/../../../requirements/devenv.txt # -r requirements/_tools.in @@ -57,7 +57,7 @@ platformdirs==2.3.0 # virtualenv pre-commit==2.14.1 # via -r requirements/../../../requirements/devenv.txt -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_tools.in pyyaml==5.4.1 # via @@ -81,11 +81,13 @@ tomli==1.2.1 # via # black # pep517 -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt + # astroid # black # mypy + # pylint virtualenv==20.7.2 # via pre-commit wheel==0.37.0 diff --git a/services/sidecar/requirements/_base.txt b/services/sidecar/requirements/_base.txt index b28ced1901d..351cf6ad133 100644 --- a/services/sidecar/requirements/_base.txt +++ b/services/sidecar/requirements/_base.txt @@ -23,7 +23,6 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -31,14 +30,10 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/_base.in # -c requirements/../../../requirements/constraints.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiodocker - # aiozipkin aiopg==1.2.1 # via - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/simcore-sdk/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in aioredis==1.3.1 # via @@ -56,22 +51,9 @@ aioredlock==0.5.2 # via -r requirements/_base.in aiormq==3.2.3 # via aio-pika -aiozipkin==0.7.1 - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/_base.in - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -alembic==1.6.5 +alembic==1.7.3 # via -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in -amqp==2.6.1 +amqp==5.0.6 # via kombu async-timeout==3.0.1 # via @@ -80,18 +62,16 @@ async-timeout==3.0.1 # aioredis attrs==20.2.0 # via - # -c requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiohttp # aioredlock - # jsonschema - # openapi-core -billiard==3.6.3.0 +billiard==3.6.4.0 # via celery caio==0.6.1 # via aiofile -celery==4.4.7 +celery==5.1.2 # via -r requirements/_base.in certifi==2021.5.30 # via requests @@ -103,11 +83,21 @@ click==7.1.2 # via # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # -r requirements/_base.in + # celery + # click-didyoumean + # click-plugins + # click-repl +click-didyoumean==0.0.3 + # via celery +click-plugins==1.1.1 + # via celery +click-repl==0.2.0 + # via celery decorator==4.4.2 # via networkx dnspython==2.0.0 # via email-validator -docker==5.0.0 +docker==5.0.2 # via -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in email-validator==1.1.1 # via pydantic @@ -117,31 +107,28 @@ idna==2.10 # via # -c requirements/../../../packages/models-library/requirements/_base.in # -c requirements/../../../packages/postgres-database/requirements/_base.in - # -c requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # email-validator # requests # yarl -isodate==0.6.0 +importlib-resources==5.2.2 ; python_version < "3.9" # via - # openapi-core - # openapi-schema-validator -jsonschema==3.2.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-schema-validator - # openapi-spec-validator -kombu==4.6.11 + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # alembic +kombu==5.1.0 # via celery -lazy-object-proxy==1.4.3 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-core mako==1.1.4 # via alembic markupsafe==2.0.1 @@ -155,30 +142,18 @@ networkx==2.5 # via # -c requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -openapi-core==0.12.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -openapi-schema-validator==0.1.5 - # via openapi-spec-validator -openapi-spec-validator==0.3.1 - # via openapi-core packaging==20.4 # via # -c requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in pamqp==2.3.0 # via aiormq -prometheus-client==0.11.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in +prompt-toolkit==3.0.20 + # via click-repl psycopg2-binary==2.9.1 # via - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt # -c requirements/../../../packages/simcore-sdk/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiopg # sqlalchemy pydantic==1.8.2 @@ -207,12 +182,6 @@ pyinstrument-cext==0.2.4 # via pyinstrument pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 - # via jsonschema -python-dateutil==2.8.1 - # via alembic -python-editor==1.0.4 - # via alembic pytz==2020.1 # via celery pyyaml==5.4.1 @@ -228,20 +197,14 @@ pyyaml==5.4.1 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-spec-validator redis==3.5.3 # via celery requests==2.25.1 # via docker six==1.15.0 # via - # isodate - # jsonschema - # openapi-core - # openapi-schema-validator - # openapi-spec-validator + # click-repl # packaging - # python-dateutil # tenacity # websocket-client sqlalchemy==1.3.24 @@ -250,7 +213,6 @@ sqlalchemy==1.3.24 # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/_base.in # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt @@ -259,12 +221,9 @@ sqlalchemy==1.3.24 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in # aiopg # alembic -strict-rfc3339==0.7 - # via openapi-core tenacity==6.2.0 # via # -c requirements/../../../packages/service-library/requirements/_base.in @@ -272,11 +231,7 @@ tenacity==6.2.0 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in -trafaret==2.1.0 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # aiodocker # aiohttp @@ -299,18 +254,17 @@ urllib3==1.26.5 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # -r requirements/_base.in # requests -vine==1.3.0 +vine==5.0.0 # via # amqp # celery + # kombu +wcwidth==0.2.5 + # via prompt-toolkit websocket-client==0.59.0 # via # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # docker -werkzeug==2.0.1 - # via - # -c requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in yarl==1.6.3 # via # -c requirements/../../../packages/postgres-database/requirements/_base.in @@ -319,6 +273,8 @@ yarl==1.6.3 # aio-pika # aiohttp # aiormq +zipp==3.5.0 + # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/sidecar/requirements/_packages.txt b/services/sidecar/requirements/_packages.txt index 3290d573450..a011b11a3e2 100644 --- a/services/sidecar/requirements/_packages.txt +++ b/services/sidecar/requirements/_packages.txt @@ -24,30 +24,12 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in - # aiozipkin aiopg==1.2.1 # via # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in -aiozipkin==0.7.1 - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -alembic==1.6.5 +alembic==1.7.3 # via # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in @@ -58,13 +40,11 @@ async-timeout==3.0.1 # aiopg attrs==20.2.0 # via + # -c requirements/../../../packages/service-library/requirements/./constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # aiohttp - # jsonschema - # openapi-core certifi==2021.5.30 # via # -c requirements/_base.txt @@ -86,7 +66,7 @@ dnspython==2.0.0 # via # -c requirements/_base.txt # email-validator -docker==5.0.0 +docker==5.0.2 # via # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in @@ -96,35 +76,29 @@ email-validator==1.1.1 # pydantic idna==2.10 # via + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/_base.txt # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # email-validator # requests # yarl -isodate==0.6.0 - # via - # -c requirements/_base.txt - # openapi-core - # openapi-schema-validator -jsonschema==3.2.0 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-schema-validator - # openapi-spec-validator -lazy-object-proxy==1.4.3 +importlib-resources==5.2.2 ; python_version < "3.9" # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-core + # alembic mako==1.1.4 # via # -c requirements/_base.txt @@ -143,34 +117,14 @@ networkx==2.5 # via # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/_base.in -openapi-core==0.12.0 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -openapi-schema-validator==0.1.5 - # via - # -c requirements/_base.txt - # openapi-spec-validator -openapi-spec-validator==0.3.1 - # via - # -c requirements/_base.txt - # openapi-core packaging==20.4 # via # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/_base.in -prometheus-client==0.11.0 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.1 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # aiopg # sqlalchemy @@ -203,18 +157,6 @@ pyparsing==2.4.7 # via # -c requirements/_base.txt # packaging -pyrsistent==0.17.3 - # via - # -c requirements/_base.txt - # jsonschema -python-dateutil==2.8.1 - # via - # -c requirements/_base.txt - # alembic -python-editor==1.0.4 - # via - # -c requirements/_base.txt - # alembic pyyaml==5.4.1 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt @@ -228,7 +170,6 @@ pyyaml==5.4.1 # -c requirements/_base.txt # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-spec-validator # trafaret-config requests==2.25.1 # via @@ -237,13 +178,7 @@ requests==2.25.1 six==1.15.0 # via # -c requirements/_base.txt - # isodate - # jsonschema - # openapi-core - # openapi-schema-validator - # openapi-spec-validator # packaging - # python-dateutil # tenacity # websocket-client sqlalchemy==1.3.24 @@ -259,15 +194,9 @@ sqlalchemy==1.3.24 # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiopg # alembic -strict-rfc3339==0.7 - # via - # -c requirements/_base.txt - # openapi-core tenacity==6.2.0 # via # -c requirements/_base.txt @@ -278,14 +207,10 @@ tenacity==6.2.0 tqdm==4.61.1 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in trafaret==2.1.0 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # trafaret-config + # via trafaret-config trafaret-config==2.0.2 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # aiohttp @@ -313,11 +238,6 @@ websocket-client==0.59.0 # -c requirements/_base.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # docker -werkzeug==2.0.1 - # via - # -c requirements/_base.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in yarl==1.6.3 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt @@ -325,6 +245,7 @@ yarl==1.6.3 # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +zipp==3.5.0 + # via + # -c requirements/_base.txt + # importlib-resources diff --git a/services/sidecar/requirements/_test.in b/services/sidecar/requirements/_test.in index da788316fec..ed8ed781d85 100644 --- a/services/sidecar/requirements/_test.in +++ b/services/sidecar/requirements/_test.in @@ -27,6 +27,7 @@ docker python-dotenv faker minio +jsonschema # tools for CI pylint diff --git a/services/sidecar/requirements/_test.txt b/services/sidecar/requirements/_test.txt index a2c4f3f9c49..79aa3610d74 100644 --- a/services/sidecar/requirements/_test.txt +++ b/services/sidecar/requirements/_test.txt @@ -15,12 +15,12 @@ aiopg==1.2.1 # -c requirements/_base.txt # -c requirements/_packages.txt # -r requirements/_test.in -alembic==1.6.5 +alembic==1.7.3 # via # -c requirements/_base.txt # -c requirements/_packages.txt # -r requirements/_test.in -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -33,6 +33,7 @@ attrs==20.2.0 # -c requirements/_base.txt # -c requirements/_packages.txt # aiohttp + # jsonschema # pytest certifi==2021.5.30 # via @@ -53,7 +54,7 @@ coverage==5.5 # pytest-cov coveralls==3.2.0 # via -r requirements/_test.in -docker==5.0.0 +docker==5.0.2 # via # -c requirements/_base.txt # -c requirements/_packages.txt @@ -70,15 +71,20 @@ idna==2.10 # -c requirements/_packages.txt # requests # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_packages.txt + # alembic iniconfig==1.1.1 # via pytest isort==5.9.3 # via pylint +jsonschema==3.2.0 + # via -r requirements/_test.in lazy-object-proxy==1.4.3 - # via - # -c requirements/_base.txt - # -c requirements/_packages.txt - # astroid + # via astroid mako==1.1.4 # via # -c requirements/_base.txt @@ -123,14 +129,16 @@ ptvsd==4.3.2 # via -r requirements/_test.in py==1.10.0 # via pytest -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pyparsing==2.4.7 # via # -c requirements/_base.txt # -c requirements/_packages.txt # packaging -pytest==6.2.4 +pyrsistent==0.18.0 + # via jsonschema +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -155,18 +163,9 @@ pytest-mock==3.6.1 pytest-sugar==0.9.4 # via -r requirements/_test.in python-dateutil==2.8.1 - # via - # -c requirements/_base.txt - # -c requirements/_packages.txt - # alembic - # faker + # via faker python-dotenv==0.19.0 # via -r requirements/_test.in -python-editor==1.0.4 - # via - # -c requirements/_base.txt - # -c requirements/_packages.txt - # alembic requests==2.25.1 # via # -c requirements/_base.txt @@ -177,6 +176,7 @@ six==1.15.0 # via # -c requirements/_base.txt # -c requirements/_packages.txt + # jsonschema # packaging # python-dateutil # websocket-client @@ -195,11 +195,13 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -c requirements/_packages.txt # aiohttp + # astroid + # pylint urllib3==1.26.5 # via # -c requirements/../../../requirements/constraints.txt @@ -219,6 +221,11 @@ yarl==1.6.3 # -c requirements/_base.txt # -c requirements/_packages.txt # aiohttp +zipp==3.5.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/sidecar/requirements/_tools.txt b/services/sidecar/requirements/_tools.txt index 98ab26935a5..1c496ebb59d 100644 --- a/services/sidecar/requirements/_tools.txt +++ b/services/sidecar/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -45,6 +43,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt @@ -71,6 +70,12 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3 diff --git a/services/sidecar/src/simcore_service_sidecar/rabbitmq.py b/services/sidecar/src/simcore_service_sidecar/rabbitmq.py index 1261a3837d5..aae77acb525 100644 --- a/services/sidecar/src/simcore_service_sidecar/rabbitmq.py +++ b/services/sidecar/src/simcore_service_sidecar/rabbitmq.py @@ -86,8 +86,9 @@ async def close(self): await self._channel.close() await self._connection.close() + @staticmethod async def _post_message( - self, exchange: aio_pika.Exchange, data: Dict[str, Union[str, Any]] + exchange: aio_pika.Exchange, data: Dict[str, Union[str, Any]] ): await exchange.publish( aio_pika.Message(body=json.dumps(data).encode()), routing_key="" diff --git a/services/sidecar/tests/unit/test_celery_configurator.py b/services/sidecar/tests/unit/test_celery_configurator.py index f65440f007a..a012f1770d0 100644 --- a/services/sidecar/tests/unit/test_celery_configurator.py +++ b/services/sidecar/tests/unit/test_celery_configurator.py @@ -12,7 +12,8 @@ def _toggle_gpu_mock(mocker, has_gpu: bool) -> None: class FakeContainer: - async def wait(self, **kwargs): + @staticmethod + async def wait(**kwargs): return {"StatusCode": 0 if has_gpu else 127} containers_get = mocker.patch( diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index 7533986dd6b..bf18a2980c6 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -179,7 +179,7 @@ typer==0.4.0 # via # -r requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiohttp # pydantic @@ -203,7 +203,6 @@ wrapt==1.12.1 # via aiobotocore yarl==1.5.1 # via - # -c requirements/../../../packages/service-library/requirements/././constraints.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt index 98303396cc4..636966295c0 100644 --- a/services/storage/requirements/_test.txt +++ b/services/storage/requirements/_test.txt @@ -9,7 +9,7 @@ aiohttp==3.7.4.post0 # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # pytest-aiohttp -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -113,7 +113,7 @@ py==1.10.0 # via pytest pycparser==2.20 # via cffi -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pynacl==1.4.0 # via paramiko @@ -188,10 +188,12 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # aiohttp + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../requirements/constraints.txt diff --git a/services/storage/requirements/_tools.txt b/services/storage/requirements/_tools.txt index e0a0926383a..e69c5da03e0 100644 --- a/services/storage/requirements/_tools.txt +++ b/services/storage/requirements/_tools.txt @@ -8,7 +8,7 @@ argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.8b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -68,7 +68,7 @@ tomli==1.2.1 # via # black # pep517 -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/storage/src/simcore_service_storage/dsm.py b/services/storage/src/simcore_service_storage/dsm.py index 4570784b35a..f5dc795d283 100644 --- a/services/storage/src/simcore_service_storage/dsm.py +++ b/services/storage/src/simcore_service_storage/dsm.py @@ -398,7 +398,7 @@ async def upload_file_to_datcore( ): import warnings - warnings.warn("NOT IMPLEMENTED!!!") + warnings.warn(f"NOT IMPLEMENTED!!! in {self.__class__}") # uploads a locally available file to dat core given the storage path, optionally attached some meta data # api_token, api_secret = self._get_datcore_tokens(user_id) # await dcw.upload_file_to_id(destination_id, local_file_path) diff --git a/services/storage/tests/unit/s3wrapper/test_s3_client.py b/services/storage/tests/unit/s3wrapper/test_s3_client.py index c9d98877e3f..48ad91bce00 100644 --- a/services/storage/tests/unit/s3wrapper/test_s3_client.py +++ b/services/storage/tests/unit/s3wrapper/test_s3_client.py @@ -266,7 +266,7 @@ def test_list_objects(s3_client, bucket, text_files_factory): listed_objects = s3_client.list_objects(bucket) for s3_obj in listed_objects: - assert s3_obj.object_name == "level1/" or s3_obj.object_name == "level2/" + assert s3_obj.object_name in ("level1/", "level2/") listed_objects = s3_client.list_objects(bucket, prefix="level1") for s3_obj in listed_objects: @@ -278,7 +278,4 @@ def test_list_objects(s3_client, bucket, text_files_factory): listed_objects = s3_client.list_objects(bucket, recursive=True) for s3_obj in listed_objects: - assert ( - s3_obj.object_name == "level1/level2/1" - or s3_obj.object_name == "level2/level2/2" - ) + assert s3_obj.object_name in ("level1/level2/1", "level2/level2/2") diff --git a/services/storage/tests/unit/test_dsm.py b/services/storage/tests/unit/test_dsm.py index c89dd0ee430..7748a0075dd 100644 --- a/services/storage/tests/unit/test_dsm.py +++ b/services/storage/tests/unit/test_dsm.py @@ -78,9 +78,7 @@ async def test_dsm_s3(dsm_mockup_db, dsm_fixture): bobs_biostromy_files = [] for d in dsm_mockup_db.keys(): md = dsm_mockup_db[d] - if md.user_id == bob_id and ( - md.project_name == "biology" or md.project_name == "astronomy" - ): + if md.user_id == bob_id and (md.project_name in ("biology", "astronomy")): bobs_biostromy_files.append(md) assert len(data) == len(bobs_biostromy_files) diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index d937db7d45d..fe92770e80d 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -70,7 +70,7 @@ attrs==20.3.0 # aioredlock billiard==3.6.4.0 # via celery -celery==5.1.1 +celery==5.1.2 # via -r requirements/_base.in cffi==1.14.5 # via cryptography @@ -209,7 +209,7 @@ sqlalchemy==1.3.24 # aiopg tqdm==4.61.1 # via parfive -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiohttp # aiohttp-jinja2 diff --git a/services/web/server/requirements/_packages.txt b/services/web/server/requirements/_packages.txt index 8710cb44b80..61325a98a2b 100644 --- a/services/web/server/requirements/_packages.txt +++ b/services/web/server/requirements/_packages.txt @@ -154,7 +154,7 @@ tenacity==8.0.1 # -r requirements/../../../../packages/service-library/requirements/_base.in trafaret==2.1.0 # via -r requirements/../../../../packages/service-library/requirements/_aiohttp.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # aiohttp diff --git a/services/web/server/requirements/_test.txt b/services/web/server/requirements/_test.txt index 67dd7908f06..888129e3fc6 100644 --- a/services/web/server/requirements/_test.txt +++ b/services/web/server/requirements/_test.txt @@ -13,13 +13,13 @@ aiohttp==3.7.4.post0 # pytest-aiohttp aioresponses==0.7.2 # via -r requirements/_test.in -alembic==1.6.5 +alembic==1.7.3 # via -r requirements/_test.in amqp==5.0.6 # via # -c requirements/_base.txt # kombu -astroid==2.7.3 +astroid==2.8.0 # via pylint async-timeout==3.0.1 # via @@ -40,7 +40,7 @@ billiard==3.6.4.0 # via # -c requirements/_base.txt # celery -celery==5.1.1 +celery==5.1.2 # via # -c requirements/_base.txt # pytest-celery @@ -96,7 +96,7 @@ cryptography==3.4.7 # paramiko distro==1.6.0 # via docker-compose -docker==5.0.0 +docker==5.0.2 # via # -r requirements/_test.in # docker-compose @@ -120,6 +120,10 @@ idna==2.10 # -c requirements/_packages.txt # requests # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../../requirements/constraints.txt + # alembic iniconfig==1.1.1 # via pytest isodate==0.6.0 @@ -194,7 +198,7 @@ pycparser==2.20 # via # -c requirements/_base.txt # cffi -pylint==2.10.2 +pylint==2.11.1 # via -r requirements/_test.in pynacl==1.4.0 # via paramiko @@ -204,7 +208,7 @@ pyrsistent==0.18.0 # via # -c requirements/_packages.txt # jsonschema -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -233,15 +237,11 @@ pytest-runner==5.3.1 pytest-sugar==0.9.4 # via -r requirements/_test.in python-dateutil==2.8.2 - # via - # alembic - # faker + # via faker python-dotenv==0.19.0 # via # -r requirements/_test.in # docker-compose -python-editor==1.0.4 - # via alembic pytz==2021.1 # via # -c requirements/_base.txt @@ -298,11 +298,13 @@ toml==0.10.2 # pylint # pytest # pytest-cov -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -c requirements/_packages.txt # aiohttp + # astroid + # pylint urllib3==1.26.6 # via # -c requirements/../../../../requirements/constraints.txt @@ -321,7 +323,7 @@ websocket-client==0.59.0 # via # docker # docker-compose -websockets==9.1 +websockets==10.0 # via -r requirements/_test.in wrapt==1.12.1 # via astroid @@ -330,6 +332,8 @@ yarl==1.5.1 # -c requirements/_base.txt # -c requirements/_packages.txt # aiohttp +zipp==3.5.0 + # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/web/server/requirements/_tools.txt b/services/web/server/requirements/_tools.txt index ef5a74f8a21..d059416bf7d 100644 --- a/services/web/server/requirements/_tools.txt +++ b/services/web/server/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../../requirements/devenv.txt @@ -45,6 +43,7 @@ pip-tools==6.2.0 platformdirs==2.3.0 # via # -c requirements/_test.txt + # black # virtualenv pre-commit==2.14.0 # via -r requirements/../../../../requirements/devenv.txt @@ -72,6 +71,12 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3 diff --git a/services/web/server/src/simcore_service_webserver/clusters/db.py b/services/web/server/src/simcore_service_webserver/clusters/db.py index 3c7b0af21fa..94250067c09 100644 --- a/services/web/server/src/simcore_service_webserver/clusters/db.py +++ b/services/web/server/src/simcore_service_webserver/clusters/db.py @@ -45,8 +45,8 @@ def compute_this_user_cluster_access_rights( class ClustersRepository(BaseRepository): + @staticmethod async def _clusters_from_cluster_ids( - self, conn: sa.engine.Connection, cluster_ids: Set[PositiveInt], offset: int = 0, diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_db.py b/services/web/server/src/simcore_service_webserver/projects/projects_db.py index e8623bd5088..0c730d21770 100644 --- a/services/web/server/src/simcore_service_webserver/projects/projects_db.py +++ b/services/web/server/src/simcore_service_webserver/projects/projects_db.py @@ -372,9 +372,8 @@ async def load_projects( total_number_of_projects, ) - async def __load_user_groups( - self, conn: SAConnection, user_id: int - ) -> List[RowProxy]: + @staticmethod + async def __load_user_groups(conn: SAConnection, user_id: int) -> List[RowProxy]: user_groups: List[RowProxy] = [] query = ( select([groups]) @@ -761,7 +760,8 @@ async def make_unique_project_uuid(self) -> str: break return project_uuid - async def _get_user_email(self, conn: SAConnection, user_id: Optional[int]) -> str: + @staticmethod + async def _get_user_email(conn: SAConnection, user_id: Optional[int]) -> str: if not user_id: return "not_a_user@unknown.com" email: Optional[str] = await conn.scalar( @@ -769,9 +769,8 @@ async def _get_user_email(self, conn: SAConnection, user_id: Optional[int]) -> s ) return email or "Unknown" - async def _get_user_primary_group_gid( - self, conn: SAConnection, user_id: int - ) -> int: + @staticmethod + async def _get_user_primary_group_gid(conn: SAConnection, user_id: int) -> int: primary_gid: int = await conn.scalar( sa.select([users.c.primary_gid]).where(users.c.id == str(user_id)) ) @@ -779,7 +778,8 @@ async def _get_user_primary_group_gid( raise UserNotFoundError(uid=user_id) return primary_gid - async def _get_tags_by_project(self, conn: SAConnection, project_id: str) -> List: + @staticmethod + async def _get_tags_by_project(conn: SAConnection, project_id: str) -> List: query = sa.select([study_tags.c.tag_id]).where( study_tags.c.study_id == project_id ) diff --git a/services/web/server/src/simcore_service_webserver/version_control_db.py b/services/web/server/src/simcore_service_webserver/version_control_db.py index 8afdb33bb28..a3bcc13f55c 100644 --- a/services/web/server/src/simcore_service_webserver/version_control_db.py +++ b/services/web/server/src/simcore_service_webserver/version_control_db.py @@ -158,9 +158,8 @@ async def _update_state(self, repo_id: int, conn: SAConnection): assert repo return repo, head_commit, project - async def _upsert_snapshot( - self, repo: RowProxy, project: RowProxy, conn: SAConnection - ): + @staticmethod + async def _upsert_snapshot(repo: RowProxy, project: RowProxy, conn: SAConnection): # has changes wrt previous commit # if exists, ui might change insert_stmt = pg_insert(projects_vc_snapshots).values( diff --git a/tests/e2e/requirements/requirements.txt b/tests/e2e/requirements/requirements.txt index 001118401c0..8e25d34ea0e 100644 --- a/tests/e2e/requirements/requirements.txt +++ b/tests/e2e/requirements/requirements.txt @@ -6,7 +6,7 @@ # certifi==2021.5.30 # via requests -charset-normalizer==2.0.4 +charset-normalizer==2.0.6 # via requests docker==5.0.2 # via -r requirements.in diff --git a/tests/environment-setup/requirements/requirements.txt b/tests/environment-setup/requirements/requirements.txt index 3f30767b85b..4a7bbd08ab6 100644 --- a/tests/environment-setup/requirements/requirements.txt +++ b/tests/environment-setup/requirements/requirements.txt @@ -7,7 +7,6 @@ aiohttp==3.7.4.post0 # via # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/_base.in # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # pytest-aiohttp @@ -15,14 +14,14 @@ async-timeout==3.0.1 # via aiohttp attrs==20.3.0 # via - # -c requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # aiohttp # pytest chardet==4.0.0 # via aiohttp idna==2.10 # via - # -c requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # yarl iniconfig==1.1.1 # via pytest @@ -48,7 +47,7 @@ pydantic==1.8.2 # -r requirements/requirements.in pyparsing==2.4.7 # via packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/requirements.in # pytest-aiohttp @@ -73,7 +72,7 @@ termcolor==1.1.0 # via pytest-sugar toml==0.10.2 # via pytest -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiohttp # pydantic diff --git a/tests/public-api/requirements/_test.txt b/tests/public-api/requirements/_test.txt index 0a77d2f7454..02157c23f8d 100644 --- a/tests/public-api/requirements/_test.txt +++ b/tests/public-api/requirements/_test.txt @@ -18,7 +18,7 @@ charset-normalizer==2.0.4 # via requests coverage==5.5 # via pytest-cov -docker==5.0.0 +docker==5.0.2 # via -r requirements/_test.in faker==8.11.0 # via -r requirements/_test.in @@ -47,7 +47,7 @@ pyparsing==2.4.7 # via packaging pyrsistent==0.18.0 # via jsonschema -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-asyncio diff --git a/tests/public-api/requirements/_tools.txt b/tests/public-api/requirements/_tools.txt index 4f99122bacf..1d8a242de36 100644 --- a/tests/public-api/requirements/_tools.txt +++ b/tests/public-api/requirements/_tools.txt @@ -4,11 +4,9 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -37,7 +35,9 @@ pep517==0.11.0 pip-tools==6.2.0 # via -r requirements/../../../requirements/devenv.txt platformdirs==2.2.0 - # via virtualenv + # via + # black + # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt pyyaml==5.4.1 @@ -59,6 +59,8 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via black virtualenv==20.7.0 # via pre-commit wheel==0.36.2 diff --git a/tests/swarm-deploy/requirements/_test.in b/tests/swarm-deploy/requirements/_test.in index f57a47d5e36..0471fbcd0ca 100644 --- a/tests/swarm-deploy/requirements/_test.in +++ b/tests/swarm-deploy/requirements/_test.in @@ -10,6 +10,8 @@ alembic click coverage docker +jsonschema +minio pytest pytest-aiohttp pytest-cov @@ -20,4 +22,3 @@ pytest-sugar python-dotenv pyyaml tenacity -minio diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt index 53931d386f8..ce6f045ea4e 100644 --- a/tests/swarm-deploy/requirements/_test.txt +++ b/tests/swarm-deploy/requirements/_test.txt @@ -21,30 +21,13 @@ aiohttp==3.7.4.post0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in - # aiozipkin # pytest-aiohttp aiopg==1.3.1 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/_base.in + # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in aiormq==3.3.1 # via aio-pika -aiozipkin==0.7.1 - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -alembic==1.6.5 +alembic==1.7.3 # via # -r requirements/../../../packages/postgres-database/requirements/_migration.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in @@ -55,12 +38,11 @@ async-timeout==3.0.1 # aiopg attrs==20.3.0 # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # aiohttp # jsonschema - # openapi-core # pytest certifi==2021.5.30 # via @@ -84,7 +66,7 @@ coverage==5.5 # pytest-cov dnspython==2.1.0 # via email-validator -docker==5.0.0 +docker==5.0.2 # via # -r requirements/../../../packages/postgres-database/requirements/_migration.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in @@ -93,33 +75,31 @@ email-validator==1.1.3 # via pydantic idna==2.10 # via + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # email-validator # requests # yarl +importlib-resources==5.2.2 ; python_version < "3.9" + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/postgres-database/requirements/_migration.txt + # alembic iniconfig==1.1.1 # via pytest -isodate==0.6.0 - # via - # openapi-core - # openapi-schema-validator jsonschema==3.2.0 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-schema-validator - # openapi-spec-validator -lazy-object-proxy==1.4.3 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # openapi-core + # via -r requirements/_test.in mako==1.1.4 # via # -r requirements/../../../packages/postgres-database/requirements/_migration.txt @@ -145,14 +125,6 @@ multidict==5.1.0 # yarl networkx==2.6.2 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -openapi-core==0.12.0 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -openapi-schema-validator==0.1.5 - # via openapi-spec-validator -openapi-spec-validator==0.3.1 - # via openapi-core packaging==21.0 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in @@ -162,16 +134,10 @@ pamqp==2.3.0 # via aiormq pluggy==0.13.1 # via pytest -prometheus-client==0.11.0 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.1 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # aiopg # sqlalchemy @@ -199,7 +165,7 @@ pyparsing==2.4.7 # via packaging pyrsistent==0.18.0 # via jsonschema -pytest==6.2.4 +pytest==6.2.5 # via # -r requirements/_test.in # pytest-aiohttp @@ -219,16 +185,8 @@ pytest-runner==5.3.1 # via -r requirements/_test.in pytest-sugar==0.9.4 # via -r requirements/_test.in -python-dateutil==2.8.2 - # via - # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # alembic python-dotenv==0.19.0 # via -r requirements/_test.in -python-editor==1.0.4 - # via - # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # alembic pyyaml==5.4.1 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt @@ -241,7 +199,6 @@ pyyaml==5.4.1 # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_test.in - # openapi-spec-validator # trafaret-config requests==2.26.0 # via @@ -250,12 +207,7 @@ requests==2.26.0 six==1.16.0 # via # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # isodate # jsonschema - # openapi-core - # openapi-schema-validator - # openapi-spec-validator - # python-dateutil # websocket-client sqlalchemy==1.3.24 # via @@ -268,13 +220,9 @@ sqlalchemy==1.3.24 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aiopg # alembic -strict-rfc3339==0.7 - # via openapi-core tenacity==8.0.1 # via # -r requirements/../../../packages/postgres-database/requirements/_migration.txt @@ -292,13 +240,10 @@ toml==0.10.2 tqdm==4.62.0 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in trafaret==2.1.0 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in - # trafaret-config + # via trafaret-config trafaret-config==2.0.2 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via # aiohttp # pydantic @@ -324,10 +269,6 @@ websocket-client==0.59.0 # -r requirements/../../../packages/postgres-database/requirements/_migration.txt # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_migration.in # docker -werkzeug==2.0.1 - # via - # -r requirements/../../../packages/service-library/requirements/_base.in - # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in yarl==1.6.3 # via # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.txt @@ -335,6 +276,10 @@ yarl==1.6.3 # aio-pika # aiohttp # aiormq +zipp==3.5.0 + # via + # -r requirements/../../../packages/postgres-database/requirements/_migration.txt + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tests/swarm-deploy/requirements/_tools.txt b/tests/swarm-deploy/requirements/_tools.txt index 4aac1046918..1e3a083c97c 100644 --- a/tests/swarm-deploy/requirements/_tools.txt +++ b/tests/swarm-deploy/requirements/_tools.txt @@ -4,13 +4,11 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -appdirs==1.4.4 - # via black argh==0.26.2 # via watchdog backports.entry-points-selectable==1.1.0 # via virtualenv -black==21.7b0 +black==21.9b0 # via -r requirements/../../../requirements/devenv.txt bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -40,7 +38,9 @@ pep517==0.11.0 pip-tools==6.2.0 # via -r requirements/../../../requirements/devenv.txt platformdirs==2.2.0 - # via virtualenv + # via + # black + # virtualenv pre-commit==2.14.0 # via -r requirements/../../../requirements/devenv.txt pyyaml==5.4.1 @@ -63,6 +63,10 @@ tomli==1.2.1 # via # black # pep517 +typing-extensions==3.10.0.2 + # via + # -c requirements/_test.txt + # black virtualenv==20.7.0 # via pre-commit watchdog==2.1.3