From 18eecee51aa9262794bc6918ff90a7192e96707c Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Mon, 15 Feb 2021 18:55:11 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Maintenance/week07=20(#?= =?UTF-8?q?2148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update api/tests reqs * update tests/pulic-api reqs * update tests/service-integration reqs * update tests/s3wrapper reqs * update api-server test reqs * update catalog test reqs * update director2 test reqs * update sidecar test reqs * update storage test reqs * update test-env reqs * updates models-library reqs * updates service-lib reqs * UPdates reqs simcore-sdk * adds constraint introduced by coveralls via requests * upgrades postgres-database reqs * upgrades format webserver reqs * upgrades format storage reqs * Updates reqs format in sidecar * Upgrades reqs format for director-v2 * Upgrades reqs format for catalog * upgrades reqs in tests/e2e * Upgrade reqs in swarm-deploy * Split swarm-deploy reqs in small reqs files * Adds vulnerability to contraints Second pass with updated constraints on all tests+tool requirements * updated format reqs in director and fixes dependencies * upgrades cryptopgrahy package * upgrades pip to ~21.0.1 --- CHANGELOG.md | 111 +---- api/tests/requirements.txt | 148 ++++-- ci/helpers/ensure_python_pip.bash | 2 +- .../models-library/requirements/_base.txt | 17 +- .../models-library/requirements/_test.txt | 158 +++++-- .../models-library/requirements/_tools.txt | 103 +++- packages/postgres-database/docker/Dockerfile | 2 +- .../postgres-database/requirements/_base.txt | 22 +- .../requirements/_migration.in | 5 +- .../requirements/_migration.txt | 68 ++- .../postgres-database/requirements/_test.txt | 260 ++++++++--- .../postgres-database/requirements/_tools.txt | 103 +++- packages/s3wrapper/requirements/_base.txt | 26 +- packages/s3wrapper/requirements/_test.txt | 186 ++++++-- packages/s3wrapper/requirements/_tools.txt | 103 +++- .../requirements/_base.txt | 98 ++-- .../requirements/_test.txt | 140 ++++-- .../requirements/_tools.txt | 110 ++++- .../service-library/requirements/_base.txt | 130 ++++-- .../service-library/requirements/_test.txt | 252 +++++++--- .../service-library/requirements/_tools.txt | 109 ++++- packages/simcore-sdk/requirements/_base.txt | 216 +++++++-- packages/simcore-sdk/requirements/_test.txt | 240 +++++++--- packages/simcore-sdk/requirements/_tools.txt | 107 ++++- requirements/constraints.txt | 7 + requirements/tools/Dockerfile | 2 +- scripts/openapi/oas_resolver/Dockerfile | 2 +- services/api-server/Dockerfile | 2 +- services/api-server/requirements/_base.txt | 12 +- services/api-server/requirements/_test.txt | 13 +- services/api-server/requirements/_tools.txt | 4 +- services/catalog/Dockerfile | 2 +- services/catalog/requirements/_base.in | 5 +- services/catalog/requirements/_base.txt | 199 ++++++-- services/catalog/requirements/_test.in | 1 + services/catalog/requirements/_test.txt | 326 ++++++++++--- services/catalog/requirements/_tools.txt | 115 +++-- services/catalog/requirements/dev.txt | 2 +- services/director-v2/Dockerfile | 2 +- services/director-v2/requirements/_base.txt | 260 ++++++++--- services/director-v2/requirements/_test.txt | 441 ++++++++++++++---- services/director-v2/requirements/_tools.txt | 117 +++-- services/director-v2/requirements/dev.txt | 2 +- services/director/Dockerfile | 2 +- services/director/requirements/_base.txt | 189 ++++++-- services/director/requirements/ci.txt | 1 - services/director/requirements/dev.txt | 1 - services/director/requirements/prod.txt | 4 - services/director/setup.py | 1 - .../src/simcore_service_director/producer.py | 2 +- .../services_common.py | 40 ++ services/migration/Dockerfile | 2 +- services/sidecar/Dockerfile | 2 +- services/sidecar/requirements/_base.in | 13 +- services/sidecar/requirements/_base.txt | 183 ++++++-- services/sidecar/requirements/_packages.in | 2 +- services/sidecar/requirements/_packages.txt | 222 +++++++-- services/sidecar/requirements/_test.in | 4 +- services/sidecar/requirements/_test.txt | 252 +++++++--- services/sidecar/requirements/_tools.txt | 120 +++-- services/sidecar/requirements/ci.txt | 10 +- services/sidecar/requirements/dev.txt | 10 +- services/sidecar/requirements/prod.txt | 8 +- services/sidecar/setup.py | 2 +- services/storage/Dockerfile | 2 +- services/storage/requirements/_base.txt | 296 +++++++++--- services/storage/requirements/_test.txt | 284 ++++++++--- services/storage/requirements/_tools.txt | 116 +++-- services/web/Dockerfile | 2 +- services/web/server/requirements/_base.txt | 315 ++++++++++--- services/web/server/requirements/_test.txt | 347 +++++++++++--- services/web/server/requirements/_tools.txt | 117 +++-- services/web/server/requirements/ci.txt | 2 +- services/web/server/requirements/dev.txt | 2 +- tests/e2e/requirements/Makefile | 4 +- tests/e2e/requirements/requirements.txt | 39 +- .../requirements/requirements.txt | 87 +++- tests/public-api/requirements/_test.txt | 3 +- tests/swarm-deploy/requirements/_base.txt | 6 + .../{requirements.in => _test.in} | 6 +- tests/swarm-deploy/requirements/_test.txt | 340 ++++++++++++++ tests/swarm-deploy/requirements/_tools.in | 6 + tests/swarm-deploy/requirements/_tools.txt | 90 ++++ tests/swarm-deploy/requirements/ci.txt | 2 +- tests/swarm-deploy/requirements/dev.txt | 6 +- .../requirements/requirements.txt | 80 ---- 86 files changed, 5666 insertions(+), 1786 deletions(-) create mode 100644 services/director/src/simcore_service_director/services_common.py create mode 100644 tests/swarm-deploy/requirements/_base.txt rename tests/swarm-deploy/requirements/{requirements.in => _test.in} (95%) create mode 100644 tests/swarm-deploy/requirements/_test.txt create mode 100644 tests/swarm-deploy/requirements/_tools.in create mode 100644 tests/swarm-deploy/requirements/_tools.txt delete mode 100644 tests/swarm-deploy/requirements/requirements.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index e014e097e58..36d75c83f2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,112 +1,3 @@ # Changelog - - -## [Unreleased] - - - - -### Added - -- Started this *human-readable* CHANGELOG -- ``migration`` service that discovers postgres service and upgrades main database [#1714](https://github.com/ITISFoundation/osparc-simcore/pull/1714) -- Every group can register official classifiers for studies and services. Diplayed as a tree in UI [#1670](https://github.com/ITISFoundation/osparc-simcore/pull/1670), [#1719](https://github.com/ITISFoundation/osparc-simcore/pull/1719) , [#1722](https://github.com/ITISFoundation/osparc-simcore/pull/1722) -- GC tests are run in isolation with a template database [#1724](https://github.com/ITISFoundation/osparc-simcore/pull/1724) -- Added models_library python package that contains all basic pydantic models for use in simcore [#1856](https://github.com/ITISFoundation/osparc-simcore/pull/1856) - -### Changed - -- Speedup testing by splitting webserver [#1711](https://github.com/ITISFoundation/osparc-simcore/pull/1711) -- Refactored garbage collector and added tests [#1724](https://github.com/ITISFoundation/osparc-simcore/pull/1724) -- Logs are now displayed during testing [#1724](https://github.com/ITISFoundation/osparc-simcore/pull/1724) - - - - - - - -## [0.0.25] - 2020-08-04 - -### Added -- add traefik endpoint to api-gateway [#1555](https://github.com/ITISFoundation/osparc-simcore/pull/1555) -- Shared project concurrency (frontend) [#1591](https://github.com/ITISFoundation/osparc-simcore/pull/1591) -- Homogenize studies and services [#1569](https://github.com/ITISFoundation/osparc-simcore/pull/1569) -- UI Fine grained access - project locking and notification -- Adds support for GPU scheduling of computational services [#1553](https://github.com/ITISFoundation/osparc-simcore/pull/1553) - -### Changed -- UI/UX improvements [#1657](https://github.com/ITISFoundation/osparc-simcore/pull/1657) -- Improving storage performance [#1659](https://github.com/ITISFoundation/osparc-simcore/pull/1659) -- Theming [#1656](https://github.com/ITISFoundation/osparc-simcore/pull/1656) -- Reduce cardinality of metrics [#1593](https://github.com/ITISFoundation/osparc-simcore/pull/1593) - -### Fixed -- Platform stability: [#1645](https://github.com/ITISFoundation/osparc-simcore/pull/1645) -- Fix, improves and re-activate e2e CI testing [#1594](https://github.com/ITISFoundation/osparc-simcore/pull/1594), [#1620](https://github.com/ITISFoundation/osparc-simcore/pull/1620), [#1631](https://github.com/ITISFoundation/osparc-simcore/pull/1631), [#1600](https://github.com/ITISFoundation/osparc-simcore/pull/1600) -- Fixes defaults [#1640](https://github.com/ITISFoundation/osparc-simcore/pull/1640) -- Upgrade storage service [#1585](https://github.com/ITISFoundation/osparc-simcore/pull/1585), [#1586](https://github.com/ITISFoundation/osparc-simcore/pull/1586) -- UPgrade catalog service [#1582](https://github.com/ITISFoundation/osparc-simcore/pull/1582) -- Fixes on publish studies handling [#1632](https://github.com/ITISFoundation/osparc-simcore/pull/1632) -- Invalidate cache before starting a study [#1602](https://github.com/ITISFoundation/osparc-simcore/pull/1602) -- Some enhancements and bug fixes [#1608](https://github.com/ITISFoundation/osparc-simcore/pull/1608) -- filter studies by name before deleting them [#1629](https://github.com/ITISFoundation/osparc-simcore/pull/1629) -- Bugfix/apiserver does not need sslheaders [#1564](https://github.com/ITISFoundation/osparc-simcore/pull/1564) -- fix testing if node has gpu support [#1604](https://github.com/ITISFoundation/osparc-simcore/pull/1604) -- /study fails 500 [#1570](https://github.com/ITISFoundation/osparc-simcore/pull/1570), [#1572](https://github.com/ITISFoundation/osparc-simcore/pull/1572) -- fix codecov reports [#1568](https://github.com/ITISFoundation/osparc-simcore/pull/1568) - -### Security -- Bump yarl from 1.4.2 to 1.5.1 in /packages/postgres-database [#1665](https://github.com/ITISFoundation/osparc-simcore/pull/1665) -- Bump ujson from 3.0.0 to 3.1.0 in /packages/service-library [#1664](https://github.com/ITISFoundation/osparc-simcore/pull/1664) -- Bump pytest-docker from 0.7.2 to 0.8.0 in /packages/service-library [#1647](https://github.com/ITISFoundation/osparc-simcore/pull/1647) -- Bump aiozipkin from 0.6.0 to 0.7.0 in /packages/service-library [#1642](https://github.com/ITISFoundation/osparc-simcore/pull/1642) -- Bump lodash from 4.17.15 to 4.17.19 [#1639](https://github.com/ITISFoundation/osparc-simcore/pull/1639) -- Maintenance/upgrades test tools [#1628](https://github.com/ITISFoundation/osparc-simcore/pull/1628) -- Bugfix/concurent opening projects [#1598](https://github.com/ITISFoundation/osparc-simcore/pull/1598) -- Bugfix/allow reading groups anonymous user [#1615](https://github.com/ITISFoundation/osparc-simcore/pull/1615) -- Bump docker from 4.2.1 to 4.2.2 in /packages/postgres-database [#1605](https://github.com/ITISFoundation/osparc-simcore/pull/1605) -- Bump faker from 4.1.0 to 4.1.1 in /packages/postgres-database [#1573](https://github.com/ITISFoundation/osparc-simcore/pull/1573) -- Maintenance/upgrades and tooling [#1546](https://github.com/ITISFoundation/osparc-simcore/pull/1546) - - ---- -All notable changes to this service will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and the release numbers follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - - - - -[Unreleased]:https://github.com/ITISFoundation/osparc-simcore/compare/v0.0.25...HEAD -[0.0.25]:https://github.com/ITISFoundation/osparc-simcore/compare/v0.0.24...v0.0.25 -[0.0.24]:https://github.com/ITISFoundation/osparc-simcore/compare/v0.0.22...v0.0.24 - -[0.0.22]:https://github.com/ITISFoundation/osparc-simcore/compare/v0.0.21...v0.0.22 -[0.0.21]:https://github.com/ITISFoundation/osparc-simcore/compare/v0.0.20...v0.0.21 -[0.0.20]:https://github.com/ITISFoundation/osparc-simcore/compare/v0.0.19...v0.0.20 -[0.0.19]:https://github.com/ITISFoundation/osparc-simcore/releases/tag/v0.0.19 - - - +To see all changelogs, please open [Release Notes](https://github.com/ITISFoundation/osparc-simcore/releases) directly in github website. diff --git a/api/tests/requirements.txt b/api/tests/requirements.txt index a4ab92f14bc..c3027b33b2b 100644 --- a/api/tests/requirements.txt +++ b/api/tests/requirements.txt @@ -4,43 +4,117 @@ # # pip-compile --output-file=requirements.txt requirements.in # -aiohttp==3.7.3 # via -r requirements.in, pytest-aiohttp -async-timeout==3.0.1 # via aiohttp -attrs==20.3.0 # via aiohttp, jsonschema, openapi-core, pytest -chardet==3.0.4 # via aiohttp -coverage==5.3 # via -r requirements.in, pytest-cov -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via idna-ssl, yarl -importlib-metadata==3.1.1 # via jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -isodate==0.6.0 # via openapi-core, openapi-schema-validator -jsonschema==3.2.0 # via openapi-schema-validator, openapi-spec-validator -lazy-object-proxy==1.5.2 # via openapi-core -more-itertools==8.6.0 # via openapi-core -multidict==5.1.0 # via aiohttp, yarl -openapi-core==0.13.4 # via -r requirements.in -openapi-schema-validator==0.1.1 # via openapi-core -openapi-spec-validator==0.2.9 # via openapi-core -packaging==20.7 # via pytest, pytest-sugar -parse==1.18.0 # via openapi-core -pluggy==0.13.1 # via pytest -py==1.9.0 # via pytest -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via jsonschema -pytest-aiohttp==0.3.0 # via -r requirements.in -pytest-cov==2.10.1 # via -r requirements.in -pytest-instafail==0.4.2 # via -r requirements.in -pytest-sugar==0.9.4 # via -r requirements.in -pytest==6.1.2 # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar -pyyaml==5.3.1 # via -c ../../requirements/constraints.txt, openapi-spec-validator -six==1.15.0 # via isodate, jsonschema, openapi-core, openapi-schema-validator, openapi-spec-validator -strict-rfc3339==0.7 # via openapi-schema-validator -termcolor==1.1.0 # via pytest-sugar -toml==0.10.2 # via pytest -typing-extensions==3.7.4.3 # via aiohttp, yarl -werkzeug==1.0.1 # via openapi-core -yarl==1.6.3 # via aiohttp -zipp==3.4.0 # via importlib-metadata +aiohttp==3.7.3 + # via + # -r requirements.in + # pytest-aiohttp +async-timeout==3.0.1 + # via aiohttp +attrs==20.3.0 + # via + # aiohttp + # jsonschema + # openapi-core + # pytest +chardet==3.0.4 + # via aiohttp +coverage==5.4 + # via + # -r requirements.in + # pytest-cov +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c ../../requirements/constraints.txt + # idna-ssl + # yarl +importlib-metadata==3.4.0 + # via + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isodate==0.6.0 + # via + # openapi-core + # openapi-schema-validator +jsonschema==3.2.0 + # via + # openapi-schema-validator + # openapi-spec-validator +lazy-object-proxy==1.5.2 + # via openapi-core +more-itertools==8.7.0 + # via openapi-core +multidict==5.1.0 + # via + # aiohttp + # yarl +openapi-core==0.13.6 + # via -r requirements.in +openapi-schema-validator==0.1.1 + # via openapi-core +openapi-spec-validator==0.2.9 + # via openapi-core +packaging==20.9 + # via + # pytest + # pytest-sugar +parse==1.19.0 + # via openapi-core +pluggy==0.13.1 + # via pytest +py==1.10.0 + # via pytest +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via jsonschema +pytest-aiohttp==0.3.0 + # via -r requirements.in +pytest-cov==2.11.1 + # via -r requirements.in +pytest-instafail==0.4.2 + # via -r requirements.in +pytest-sugar==0.9.4 + # via -r requirements.in +pytest==6.2.2 + # via + # -r requirements.in + # pytest-aiohttp + # pytest-cov + # pytest-instafail + # pytest-sugar +pyyaml==5.4.1 + # via + # -c ../../requirements/constraints.txt + # openapi-spec-validator +six==1.15.0 + # via + # isodate + # jsonschema + # openapi-core + # openapi-schema-validator + # openapi-spec-validator +strict-rfc3339==0.7 + # via openapi-schema-validator +termcolor==1.1.0 + # via pytest-sugar +toml==0.10.2 + # via pytest +typing-extensions==3.7.4.3 + # via + # aiohttp + # importlib-metadata + # yarl +werkzeug==1.0.1 + # via openapi-core +yarl==1.6.3 + # via aiohttp +zipp==3.4.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/ci/helpers/ensure_python_pip.bash b/ci/helpers/ensure_python_pip.bash index c34d82bf420..23fec485432 100755 --- a/ci/helpers/ensure_python_pip.bash +++ b/ci/helpers/ensure_python_pip.bash @@ -11,7 +11,7 @@ set -o pipefail # don't hide errors within pipes IFS=$'\n\t' # Pin pip version to a compatible release https://www.python.org/dev/peps/pep-0440/#compatible-release -PIP_VERSION=20.2.2 +PIP_VERSION=21.0.1 echo "INFO:" "$(python --version)" "@" "$(command -v python)" diff --git a/packages/models-library/requirements/_base.txt b/packages/models-library/requirements/_base.txt index 2f970878001..9b557d68103 100644 --- a/packages/models-library/requirements/_base.txt +++ b/packages/models-library/requirements/_base.txt @@ -4,8 +4,15 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -dataclasses==0.8 # via pydantic -dnspython==2.0.0 # via email-validator -email-validator==1.1.2 # via pydantic -idna==2.10 # via email-validator -pydantic[email]==1.7.3 # via -r requirements/_base.in +dataclasses==0.8 + # via pydantic +dnspython==2.1.0 + # via email-validator +email-validator==1.1.2 + # via pydantic +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # email-validator +pydantic[email]==1.7.3 + # via -r requirements/_base.in diff --git a/packages/models-library/requirements/_test.txt b/packages/models-library/requirements/_test.txt index 52726403931..c392c3a194e 100644 --- a/packages/models-library/requirements/_test.txt +++ b/packages/models-library/requirements/_test.txt @@ -4,45 +4,119 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.7.3 # via pytest-aiohttp -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via aiohttp -attrs==20.3.0 # via aiohttp, pytest -certifi==2020.12.5 # via requests -chardet==3.0.4 # via aiohttp, requests -coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -docopt==0.6.2 # via coveralls -icdiff==1.9.1 # via pytest-icdiff -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via -c requirements/_base.txt, idna-ssl, requests, yarl -importlib-metadata==3.1.1 # via pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -lazy-object-proxy==1.4.3 # via astroid -mccabe==0.6.1 # via pylint -multidict==5.1.0 # via aiohttp, yarl -packaging==20.7 # via pytest, pytest-sugar -pluggy==0.13.1 # via pytest -pprintpp==0.4.0 # via pytest-icdiff -py==1.9.0 # via pytest -pylint==2.6.0 # via -r requirements/_test.in -pyparsing==2.4.7 # via packaging -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-icdiff==0.5 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest-sugar==0.9.4 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-icdiff, pytest-instafail, pytest-mock, pytest-sugar -requests==2.25.0 # via coveralls -six==1.15.0 # via astroid -termcolor==1.1.0 # via pytest-sugar -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via aiohttp, yarl -urllib3==1.26.2 # via -c requirements/../../../requirements/constraints.txt, requests -wrapt==1.12.1 # via astroid -yarl==1.6.3 # via aiohttp -zipp==3.4.0 # via importlib-metadata +aiohttp==3.7.3 + # via pytest-aiohttp +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via aiohttp +attrs==20.3.0 + # via + # aiohttp + # pytest +certifi==2020.12.5 + # via requests +chardet==3.0.4 + # via + # aiohttp + # requests +coverage==5.4 + # via + # -r requirements/_test.in + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +docopt==0.6.2 + # via coveralls +icdiff==1.9.1 + # via pytest-icdiff +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # idna-ssl + # requests + # yarl +importlib-metadata==3.4.0 + # via + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +lazy-object-proxy==1.4.3 + # via astroid +mccabe==0.6.1 + # via pylint +multidict==5.1.0 + # via + # aiohttp + # yarl +packaging==20.9 + # via + # pytest + # pytest-sugar +pluggy==0.13.1 + # via pytest +pprintpp==0.4.0 + # via pytest-icdiff +py==1.10.0 + # via pytest +pylint==2.6.0 + # via -r requirements/_test.in +pyparsing==2.4.7 + # via packaging +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-icdiff==0.5 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest-sugar==0.9.4 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-icdiff + # pytest-instafail + # pytest-mock + # pytest-sugar +requests==2.25.1 + # via coveralls +six==1.15.0 + # via astroid +termcolor==1.1.0 + # via pytest-sugar +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # aiohttp + # importlib-metadata + # yarl +urllib3==1.26.3 + # via + # -c requirements/../../../requirements/constraints.txt + # requests +wrapt==1.12.1 + # via astroid +yarl==1.6.3 + # via aiohttp +zipp==3.4.0 + # via importlib-metadata diff --git a/packages/models-library/requirements/_tools.txt b/packages/models-library/requirements/_tools.txt index d6a336ea731..45101b1df70 100644 --- a/packages/models-library/requirements/_tools.txt +++ b/packages/models-library/requirements/_tools.txt @@ -4,31 +4,84 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via black, pip-tools -dataclasses==0.8 # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, pre-commit -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -zipp==3.4.0 # via -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # black + # pip-tools +dataclasses==0.8 + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.4.0 + # via + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # pre-commit +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_test.txt + # black + # importlib-metadata +virtualenv==20.4.2 + # via pre-commit +zipp==3.4.0 + # via + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/packages/postgres-database/docker/Dockerfile b/packages/postgres-database/docker/Dockerfile index 84ae391073b..351021260b8 100644 --- a/packages/postgres-database/docker/Dockerfile +++ b/packages/postgres-database/docker/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/packages/postgres-database/requirements/_base.txt b/packages/postgres-database/requirements/_base.txt index 963a39ce910..124b9814a4c 100644 --- a/packages/postgres-database/requirements/_base.txt +++ b/packages/postgres-database/requirements/_base.txt @@ -4,9 +4,19 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -idna==2.10 # via yarl -multidict==5.1.0 # via yarl -psycopg2-binary==2.8.6 # via sqlalchemy -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in -typing-extensions==3.7.4.3 # via yarl -yarl==1.6.3 # via -r requirements/_base.in +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # yarl +multidict==5.1.0 + # via yarl +psycopg2-binary==2.8.6 + # via sqlalchemy +sqlalchemy[postgresql_psycopg2binary]==1.3.23 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in +typing-extensions==3.7.4.3 + # via yarl +yarl==1.6.3 + # via -r requirements/_base.in diff --git a/packages/postgres-database/requirements/_migration.in b/packages/postgres-database/requirements/_migration.in index 7745eda1658..84194cfe2fb 100644 --- a/packages/postgres-database/requirements/_migration.in +++ b/packages/postgres-database/requirements/_migration.in @@ -10,5 +10,8 @@ urllib3 alembic click -docker # TODO: aiodocker tenacity + +# aiohttp==3.7.3 conflicting with requests==2.25.1 -> docker +docker # TODO: aiodocker +chardet<4.0,>=2.0 diff --git a/packages/postgres-database/requirements/_migration.txt b/packages/postgres-database/requirements/_migration.txt index 44225431d0c..34441c8c1e0 100644 --- a/packages/postgres-database/requirements/_migration.txt +++ b/packages/postgres-database/requirements/_migration.txt @@ -4,20 +4,54 @@ # # pip-compile --output-file=requirements/_migration.txt requirements/_migration.in # -alembic==1.4.3 # via -r requirements/_migration.in -certifi==2020.12.5 # via requests -chardet==3.0.4 # via requests -click==7.1.2 # via -r requirements/_migration.in -docker==4.4.0 # via -r requirements/_migration.in -idna==2.10 # via -c requirements/_base.txt, requests -mako==1.1.3 # via alembic -markupsafe==1.1.1 # via mako -psycopg2-binary==2.8.6 # via -c requirements/_base.txt, sqlalchemy -python-dateutil==2.8.1 # via alembic -python-editor==1.0.4 # via alembic -requests==2.25.0 # via docker -six==1.15.0 # via docker, python-dateutil, tenacity, websocket-client -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, alembic -tenacity==6.2.0 # via -r requirements/_migration.in -urllib3==1.26.2 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_migration.in, requests -websocket-client==0.57.0 # via docker +alembic==1.5.4 + # via -r requirements/_migration.in +certifi==2020.12.5 + # via requests +chardet==3.0.4 + # via + # -r requirements/_migration.in + # requests +click==7.1.2 + # via -r requirements/_migration.in +docker==4.4.1 + # via -r requirements/_migration.in +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # requests +mako==1.1.4 + # via alembic +markupsafe==1.1.1 + # via mako +psycopg2-binary==2.8.6 + # via + # -c requirements/_base.txt + # sqlalchemy +python-dateutil==2.8.1 + # via alembic +python-editor==1.0.4 + # via alembic +requests==2.25.1 + # via docker +six==1.15.0 + # via + # docker + # python-dateutil + # tenacity + # websocket-client +sqlalchemy[postgresql_psycopg2binary]==1.3.23 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # alembic +tenacity==6.3.1 + # via -r requirements/_migration.in +urllib3==1.26.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_migration.in + # requests +websocket-client==0.57.0 + # via docker diff --git a/packages/postgres-database/requirements/_test.txt b/packages/postgres-database/requirements/_test.txt index 25c697b7e43..ff26bebba5e 100644 --- a/packages/postgres-database/requirements/_test.txt +++ b/packages/postgres-database/requirements/_test.txt @@ -4,66 +4,206 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.7.3 # via pytest-aiohttp -aiopg[sa]==1.1.0 # via -r requirements/_test.in -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via aiohttp -attrs==20.3.0 # via aiohttp, jsonschema, pytest, pytest-docker -bcrypt==3.2.0 # via paramiko -cached-property==1.5.2 # via docker-compose -certifi==2020.12.5 # via -c requirements/_migration.txt, requests -cffi==1.14.4 # via bcrypt, cryptography, pynacl -chardet==3.0.4 # via -c requirements/_migration.txt, aiohttp, requests -coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -cryptography==3.3.1 # via paramiko -distro==1.5.0 # via docker-compose -docker-compose==1.27.4 # via pytest-docker -docker[ssh]==4.4.0 # via -c requirements/_migration.txt, docker-compose -dockerpty==0.4.1 # via docker-compose -docopt==0.6.2 # via coveralls, docker-compose -faker==5.0.1 # via -r requirements/_test.in -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via -c requirements/_base.txt, -c requirements/_migration.txt, idna-ssl, requests, yarl -importlib-metadata==3.1.1 # via jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -jsonschema==3.2.0 # via docker-compose -lazy-object-proxy==1.4.3 # via astroid -mccabe==0.6.1 # via pylint -multidict==5.1.0 # via -c requirements/_base.txt, aiohttp, yarl -packaging==20.7 # via pytest -paramiko==2.7.2 # via docker -pluggy==0.13.1 # via pytest -psycopg2-binary==2.8.6 # via -c requirements/_base.txt, -c requirements/_migration.txt, aiopg, sqlalchemy -py==1.9.0 # via pytest -pycparser==2.20 # via cffi -pylint==2.6.0 # via -r requirements/_test.in -pynacl==1.4.0 # via paramiko -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via jsonschema -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-docker==0.10.1 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-instafail -python-dateutil==2.8.1 # via -c requirements/_migration.txt, faker -python-dotenv==0.15.0 # via docker-compose -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_test.in, docker-compose -requests==2.25.0 # via -c requirements/_migration.txt, coveralls, docker, docker-compose -six==1.15.0 # via -c requirements/_migration.txt, astroid, bcrypt, cryptography, docker, dockerpty, jsonschema, pynacl, python-dateutil, websocket-client -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, -c requirements/_migration.txt, aiopg -text-unidecode==1.3 # via faker -texttable==1.6.3 # via docker-compose -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, aiohttp, yarl -urllib3==1.26.2 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_migration.txt, requests -websocket-client==0.57.0 # via -c requirements/_migration.txt, docker, docker-compose -wrapt==1.12.1 # via astroid -yarl==1.6.3 # via -c requirements/_base.txt, aiohttp -zipp==3.4.0 # via importlib-metadata +aiohttp==3.7.3 + # via pytest-aiohttp +aiopg[sa]==1.1.0 + # via -r requirements/_test.in +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via aiohttp +attrs==20.3.0 + # via + # aiohttp + # jsonschema + # pytest + # pytest-docker +bcrypt==3.2.0 + # via paramiko +cached-property==1.5.2 + # via docker-compose +certifi==2020.12.5 + # via + # -c requirements/_migration.txt + # requests +cffi==1.14.5 + # via + # bcrypt + # cryptography + # pynacl +chardet==3.0.4 + # via + # -c requirements/_migration.txt + # aiohttp + # requests +coverage==5.4 + # via + # -r requirements/_test.in + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +cryptography==3.4.5 + # via + # -c requirements/../../../requirements/constraints.txt + # paramiko +distro==1.5.0 + # via docker-compose +docker-compose==1.27.4 + # via + # -c requirements/../../../requirements/constraints.txt + # pytest-docker +docker[ssh]==4.4.1 + # via + # -c requirements/_migration.txt + # docker-compose +dockerpty==0.4.1 + # via docker-compose +docopt==0.6.2 + # via + # coveralls + # docker-compose +faker==6.1.1 + # via -r requirements/_test.in +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_migration.txt + # idna-ssl + # requests + # yarl +importlib-metadata==3.4.0 + # via + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +jsonschema==3.2.0 + # via docker-compose +lazy-object-proxy==1.4.3 + # via astroid +mccabe==0.6.1 + # via pylint +multidict==5.1.0 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +packaging==20.9 + # via pytest +paramiko==2.7.2 + # via docker +pluggy==0.13.1 + # via pytest +psycopg2-binary==2.8.6 + # via + # -c requirements/_base.txt + # -c requirements/_migration.txt + # aiopg + # sqlalchemy +py==1.10.0 + # via pytest +pycparser==2.20 + # via cffi +pylint==2.6.0 + # via -r requirements/_test.in +pynacl==1.4.0 + # via paramiko +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via jsonschema +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-docker==0.10.1 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-docker + # pytest-instafail +python-dateutil==2.8.1 + # via + # -c requirements/_migration.txt + # faker +python-dotenv==0.15.0 + # via docker-compose +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_test.in + # docker-compose +requests==2.25.1 + # via + # -c requirements/_migration.txt + # coveralls + # docker + # docker-compose +six==1.15.0 + # via + # -c requirements/_migration.txt + # astroid + # bcrypt + # docker + # dockerpty + # jsonschema + # pynacl + # python-dateutil + # websocket-client +sqlalchemy[postgresql_psycopg2binary]==1.3.23 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_migration.txt + # aiopg +text-unidecode==1.3 + # via faker +texttable==1.6.3 + # via docker-compose +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # aiohttp + # importlib-metadata + # yarl +urllib3==1.26.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_migration.txt + # requests +websocket-client==0.57.0 + # via + # -c requirements/_migration.txt + # docker + # docker-compose +wrapt==1.12.1 + # via astroid +yarl==1.6.3 + # via + # -c requirements/_base.txt + # aiohttp +zipp==3.4.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/postgres-database/requirements/_tools.txt b/packages/postgres-database/requirements/_tools.txt index f7cd73cc734..c115ef45dd9 100644 --- a/packages/postgres-database/requirements/_tools.txt +++ b/packages/postgres-database/requirements/_tools.txt @@ -4,31 +4,84 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via black, pip-tools -dataclasses==0.8 # via black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_test.txt, pre-commit -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -zipp==3.4.0 # via -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # black + # pip-tools +dataclasses==0.8 + # via black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.4.0 + # via + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_test.txt + # pre-commit +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # importlib-metadata +virtualenv==20.4.2 + # via pre-commit +zipp==3.4.0 + # via + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/packages/s3wrapper/requirements/_base.txt b/packages/s3wrapper/requirements/_base.txt index 6bd70414679..1c1c4c30af9 100644 --- a/packages/s3wrapper/requirements/_base.txt +++ b/packages/s3wrapper/requirements/_base.txt @@ -4,10 +4,22 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -certifi==2020.12.5 # via minio -configparser==5.0.1 # via minio -minio==6.0.2 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in -python-dateutil==2.8.1 # via minio -pytz==2020.4 # via minio -six==1.15.0 # via python-dateutil -urllib3==1.26.2 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in, minio +certifi==2020.12.5 + # via minio +configparser==5.0.1 + # via minio +minio==6.0.2 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in +python-dateutil==2.8.1 + # via minio +pytz==2021.1 + # via minio +six==1.15.0 + # via python-dateutil +urllib3==1.26.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in + # minio diff --git a/packages/s3wrapper/requirements/_test.txt b/packages/s3wrapper/requirements/_test.txt index e3ff3e3337a..6e7f779a193 100644 --- a/packages/s3wrapper/requirements/_test.txt +++ b/packages/s3wrapper/requirements/_test.txt @@ -4,52 +4,146 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -astroid==2.4.2 # via pylint -attrs==20.3.0 # via jsonschema, pytest, pytest-docker -bcrypt==3.2.0 # via paramiko -cached-property==1.5.2 # via docker-compose -certifi==2020.12.5 # via -c requirements/_base.txt, requests -cffi==1.14.4 # via bcrypt, cryptography, pynacl -chardet==3.0.4 # via requests -coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -cryptography==3.3.1 # via paramiko -distro==1.5.0 # via docker-compose -docker-compose==1.27.4 # via pytest-docker -docker[ssh]==4.4.0 # via docker-compose -dockerpty==0.4.1 # via docker-compose -docopt==0.6.2 # via coveralls, docker-compose -idna==2.10 # via requests -importlib-metadata==3.1.1 # via jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -jsonschema==3.2.0 # via docker-compose -lazy-object-proxy==1.4.3 # via astroid -mccabe==0.6.1 # via pylint -packaging==20.7 # via pytest -paramiko==2.7.2 # via docker -pluggy==0.13.1 # via pytest -py==1.9.0 # via pytest -pycparser==2.20 # via cffi -pylint==2.6.0 # via -r requirements/_test.in -pynacl==1.4.0 # via paramiko -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via jsonschema -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-docker==0.10.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-cov, pytest-docker -python-dotenv==0.15.0 # via docker-compose -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, docker-compose -requests==2.25.0 # via -r requirements/_test.in, coveralls, docker, docker-compose -six==1.15.0 # via -c requirements/_base.txt, astroid, bcrypt, cryptography, docker, dockerpty, jsonschema, pynacl, websocket-client -texttable==1.6.3 # via docker-compose -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -urllib3==1.26.2 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, requests -websocket-client==0.57.0 # via docker, docker-compose -wrapt==1.12.1 # via astroid -zipp==3.4.0 # via importlib-metadata +astroid==2.4.2 + # via pylint +attrs==20.3.0 + # via + # jsonschema + # pytest + # pytest-docker +bcrypt==3.2.0 + # via paramiko +cached-property==1.5.2 + # via docker-compose +certifi==2020.12.5 + # via + # -c requirements/_base.txt + # requests +cffi==1.14.5 + # via + # bcrypt + # cryptography + # pynacl +chardet==4.0.0 + # via requests +coverage==5.4 + # via + # -r requirements/_test.in + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +cryptography==3.4.5 + # via + # -c requirements/../../../requirements/constraints.txt + # paramiko +distro==1.5.0 + # via docker-compose +docker-compose==1.27.4 + # via + # -c requirements/../../../requirements/constraints.txt + # pytest-docker +docker[ssh]==4.4.1 + # via docker-compose +dockerpty==0.4.1 + # via docker-compose +docopt==0.6.2 + # via + # coveralls + # docker-compose +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # requests +importlib-metadata==3.4.0 + # via + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +jsonschema==3.2.0 + # via docker-compose +lazy-object-proxy==1.4.3 + # via astroid +mccabe==0.6.1 + # via pylint +packaging==20.9 + # via pytest +paramiko==2.7.2 + # via docker +pluggy==0.13.1 + # via pytest +py==1.10.0 + # via pytest +pycparser==2.20 + # via cffi +pylint==2.6.0 + # via -r requirements/_test.in +pynacl==1.4.0 + # via paramiko +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via jsonschema +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-docker==0.10.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-cov + # pytest-docker +python-dotenv==0.15.0 + # via docker-compose +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # docker-compose +requests==2.25.1 + # via + # -r requirements/_test.in + # coveralls + # docker + # docker-compose +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid + # bcrypt + # docker + # dockerpty + # jsonschema + # pynacl + # websocket-client +texttable==1.6.3 + # via docker-compose +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via importlib-metadata +urllib3==1.26.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # requests +websocket-client==0.57.0 + # via + # docker + # docker-compose +wrapt==1.12.1 + # via astroid +zipp==3.4.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/s3wrapper/requirements/_tools.txt b/packages/s3wrapper/requirements/_tools.txt index 9c7d265dbc2..ffdbb4483a3 100644 --- a/packages/s3wrapper/requirements/_tools.txt +++ b/packages/s3wrapper/requirements/_tools.txt @@ -4,31 +4,84 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via black, pip-tools -dataclasses==0.8 # via black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_test.txt, pre-commit -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via black -virtualenv==20.2.2 # via pre-commit -zipp==3.4.0 # via -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # black + # pip-tools +dataclasses==0.8 + # via black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.4.0 + # via + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_test.txt + # pre-commit +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_test.txt + # black + # importlib-metadata +virtualenv==20.4.2 + # via pre-commit +zipp==3.4.0 + # via + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/packages/service-integration/requirements/_base.txt b/packages/service-integration/requirements/_base.txt index cf78cef302b..7de001935ff 100644 --- a/packages/service-integration/requirements/_base.txt +++ b/packages/service-integration/requirements/_base.txt @@ -4,32 +4,78 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -attrs==20.3.0 # via jsonschema, pytest -certifi==2020.12.5 # via requests -chardet==3.0.4 # via requests -click==7.1.2 # via -r requirements/_base.in -dataclasses==0.8 # via pydantic -dnspython==2.0.0 # via email-validator -docker==4.4.0 # via -r requirements/_base.in -email-validator==1.1.2 # via pydantic -idna==2.10 # via email-validator, requests -importlib-metadata==3.1.1 # via jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -jsonschema==3.2.0 # via -r requirements/_base.in -packaging==20.7 # via pytest -pluggy==0.13.1 # via pytest -py==1.9.0 # via pytest -pydantic[email]==1.7.3 # via -r requirements/../../../packages/models-library/requirements/_base.in -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via jsonschema -pytest==6.1.2 # via -r requirements/_base.in -pyyaml==5.3.1 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in -requests==2.25.0 # via docker -six==1.15.0 # via docker, jsonschema, websocket-client -toml==0.10.2 # via pytest -urllib3==1.26.2 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, requests -websocket-client==0.57.0 # via docker -zipp==3.4.0 # via importlib-metadata +attrs==20.3.0 + # via + # jsonschema + # pytest +certifi==2020.12.5 + # via requests +chardet==4.0.0 + # via requests +click==7.1.2 + # via -r requirements/_base.in +dataclasses==0.8 + # via pydantic +dnspython==2.1.0 + # via email-validator +docker==4.4.1 + # via -r requirements/_base.in +email-validator==1.1.2 + # via pydantic +idna==2.10 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # email-validator + # requests +importlib-metadata==3.4.0 + # via + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +jsonschema==3.2.0 + # via -r requirements/_base.in +packaging==20.9 + # via pytest +pluggy==0.13.1 + # via pytest +py==1.10.0 + # via pytest +pydantic[email]==1.7.3 + # via -r requirements/../../../packages/models-library/requirements/_base.in +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via jsonschema +pytest==6.2.2 + # via -r requirements/_base.in +pyyaml==5.4.1 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in +requests==2.25.1 + # via docker +six==1.15.0 + # via + # docker + # jsonschema + # websocket-client +toml==0.10.2 + # via pytest +typing-extensions==3.7.4.3 + # via importlib-metadata +urllib3==1.26.3 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # requests +websocket-client==0.57.0 + # via docker +zipp==3.4.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/service-integration/requirements/_test.txt b/packages/service-integration/requirements/_test.txt index bf2f4e2b09c..338e39c9e68 100644 --- a/packages/service-integration/requirements/_test.txt +++ b/packages/service-integration/requirements/_test.txt @@ -4,34 +4,112 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -astroid==2.4.2 # via pylint -attrs==20.3.0 # via -c requirements/_base.txt, pytest -certifi==2020.12.5 # via -c requirements/_base.txt, requests -chardet==3.0.4 # via -c requirements/_base.txt, requests -coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -docopt==0.6.2 # via coveralls -idna==2.10 # via -c requirements/_base.txt, requests -importlib-metadata==3.1.1 # via -c requirements/_base.txt, pluggy, pytest -iniconfig==1.1.1 # via -c requirements/_base.txt, pytest -isort==5.6.4 # via pylint -lazy-object-proxy==1.4.3 # via astroid -mccabe==0.6.1 # via pylint -packaging==20.7 # via -c requirements/_base.txt, pytest, pytest-sugar -pluggy==0.13.1 # via -c requirements/_base.txt, pytest -py==1.9.0 # via -c requirements/_base.txt, pytest -pylint==2.6.0 # via -r requirements/_test.in -pyparsing==2.4.7 # via -c requirements/_base.txt, packaging -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest-sugar==0.9.4 # via -r requirements/_test.in -pytest==6.1.2 # via -c requirements/_base.txt, -r requirements/_test.in, pytest-cov, pytest-instafail, pytest-sugar -requests==2.25.0 # via -c requirements/_base.txt, coveralls -six==1.15.0 # via -c requirements/_base.txt, astroid -termcolor==1.1.0 # via pytest-sugar -toml==0.10.2 # via -c requirements/_base.txt, pylint, pytest -typed-ast==1.4.1 # via astroid -urllib3==1.26.2 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, requests -wrapt==1.12.1 # via astroid -zipp==3.4.0 # via -c requirements/_base.txt, importlib-metadata +astroid==2.4.2 + # via pylint +attrs==20.3.0 + # via + # -c requirements/_base.txt + # pytest +certifi==2020.12.5 + # via + # -c requirements/_base.txt + # requests +chardet==4.0.0 + # via + # -c requirements/_base.txt + # requests +coverage==5.4 + # via + # -r requirements/_test.in + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +docopt==0.6.2 + # via coveralls +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # requests +importlib-metadata==3.4.0 + # via + # -c requirements/_base.txt + # pluggy + # pytest +iniconfig==1.1.1 + # via + # -c requirements/_base.txt + # pytest +isort==5.7.0 + # via pylint +lazy-object-proxy==1.4.3 + # via astroid +mccabe==0.6.1 + # via pylint +packaging==20.9 + # via + # -c requirements/_base.txt + # pytest + # pytest-sugar +pluggy==0.13.1 + # via + # -c requirements/_base.txt + # pytest +py==1.10.0 + # via + # -c requirements/_base.txt + # pytest +pylint==2.6.0 + # via -r requirements/_test.in +pyparsing==2.4.7 + # via + # -c requirements/_base.txt + # packaging +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest-sugar==0.9.4 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -c requirements/_base.txt + # -r requirements/_test.in + # pytest-cov + # pytest-instafail + # pytest-sugar +requests==2.25.1 + # via + # -c requirements/_base.txt + # coveralls +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid +termcolor==1.1.0 + # via pytest-sugar +toml==0.10.2 + # via + # -c requirements/_base.txt + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # importlib-metadata +urllib3==1.26.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # requests +wrapt==1.12.1 + # via astroid +zipp==3.4.0 + # via + # -c requirements/_base.txt + # importlib-metadata diff --git a/packages/service-integration/requirements/_tools.txt b/packages/service-integration/requirements/_tools.txt index c898c4aa37d..e1d3a067856 100644 --- a/packages/service-integration/requirements/_tools.txt +++ b/packages/service-integration/requirements/_tools.txt @@ -4,31 +4,91 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via -c requirements/_base.txt, black, pip-tools -dataclasses==0.8 # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, pre-commit -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_base.txt, -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via black -virtualenv==20.2.2 # via pre-commit -zipp==3.4.0 # via -c requirements/_base.txt, -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # -c requirements/_base.txt + # black + # pip-tools +dataclasses==0.8 + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # pre-commit +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # importlib-metadata +virtualenv==20.4.2 + # via pre-commit +zipp==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt index cb458e3ce3f..d509b45afdc 100644 --- a/packages/service-library/requirements/_base.txt +++ b/packages/service-library/requirements/_base.txt @@ -4,38 +4,104 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aiodebug==1.1.2 # via -r requirements/_base.in -aiohttp==3.7.3 # via -r requirements/_base.in, aiozipkin -aiopg[sa]==1.1.0 # via -r requirements/_base.in -aiozipkin==0.7.1 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in -async-timeout==3.0.1 # via aiohttp -attrs==20.3.0 # via -r requirements/_base.in, aiohttp, jsonschema, openapi-core -chardet==3.0.4 # via aiohttp -dataclasses==0.8 # via pydantic -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via idna-ssl, yarl -importlib-metadata==3.1.1 # via jsonschema -isodate==0.6.0 # via openapi-core -jsonschema==3.2.0 # via -r requirements/_base.in, openapi-spec-validator -lazy-object-proxy==1.4.3 # via -r requirements/_base.in, openapi-core -multidict==5.1.0 # via aiohttp, yarl -openapi-core==0.12.0 # via -r requirements/_base.in -openapi-spec-validator==0.2.9 # via openapi-core -prometheus-client==0.9.0 # via -r requirements/_base.in -psycopg2-binary==2.8.6 # via -r requirements/_base.in, aiopg, sqlalchemy -pydantic==1.7.3 # via -r requirements/_base.in -pyrsistent==0.17.3 # via jsonschema -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in, openapi-spec-validator -six==1.15.0 # via isodate, jsonschema, openapi-core, openapi-spec-validator, tenacity -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in, aiopg -strict-rfc3339==0.7 # via openapi-core -tenacity==6.2.0 # via -r requirements/_base.in -trafaret==2.1.0 # via -r requirements/_base.in -typing-extensions==3.7.4.3 # via aiohttp, yarl -ujson==4.0.1 # via -r requirements/_base.in -werkzeug==1.0.1 # via -r requirements/_base.in -yarl==1.6.3 # via aiohttp -zipp==3.4.0 # via importlib-metadata +aiodebug==1.1.2 + # via -r requirements/_base.in +aiohttp==3.7.3 + # via + # -r requirements/_base.in + # aiozipkin +aiopg[sa]==1.1.0 + # via -r requirements/_base.in +aiozipkin==0.7.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in +async-timeout==3.0.1 + # via aiohttp +attrs==20.3.0 + # via + # -r requirements/_base.in + # aiohttp + # jsonschema + # openapi-core +chardet==3.0.4 + # via aiohttp +dataclasses==0.8 + # via pydantic +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # idna-ssl + # yarl +importlib-metadata==3.4.0 + # via jsonschema +isodate==0.6.0 + # via openapi-core +jsonschema==3.2.0 + # via + # -r requirements/_base.in + # openapi-spec-validator +lazy-object-proxy==1.4.3 + # via + # -r requirements/_base.in + # openapi-core +multidict==5.1.0 + # via + # aiohttp + # yarl +openapi-core==0.12.0 + # via -r requirements/_base.in +openapi-spec-validator==0.2.9 + # via openapi-core +prometheus-client==0.9.0 + # via -r requirements/_base.in +psycopg2-binary==2.8.6 + # via + # -r requirements/_base.in + # aiopg + # sqlalchemy +pydantic==1.7.3 + # via -r requirements/_base.in +pyrsistent==0.17.3 + # via jsonschema +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in + # openapi-spec-validator +six==1.15.0 + # via + # isodate + # jsonschema + # openapi-core + # openapi-spec-validator + # tenacity +sqlalchemy[postgresql_psycopg2binary]==1.3.23 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in + # aiopg +strict-rfc3339==0.7 + # via openapi-core +tenacity==6.3.1 + # via -r requirements/_base.in +trafaret==2.1.0 + # via -r requirements/_base.in +typing-extensions==3.7.4.3 + # via + # aiohttp + # importlib-metadata + # yarl +ujson==4.0.2 + # via -r requirements/_base.in +werkzeug==1.0.1 + # via -r requirements/_base.in +yarl==1.6.3 + # via aiohttp +zipp==3.4.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt index 22a78faf2d0..64cf646b07c 100644 --- a/packages/service-library/requirements/_test.txt +++ b/packages/service-library/requirements/_test.txt @@ -4,63 +4,201 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.7.3 # via -c requirements/_base.txt, pytest-aiohttp -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via -c requirements/_base.txt, aiohttp -attrs==20.3.0 # via -c requirements/_base.txt, aiohttp, jsonschema, pytest, pytest-docker -bcrypt==3.2.0 # via paramiko -cached-property==1.5.2 # via docker-compose -certifi==2020.12.5 # via requests -cffi==1.14.4 # via bcrypt, cryptography, pynacl -chardet==3.0.4 # via -c requirements/_base.txt, aiohttp, requests -coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -cryptography==3.3.1 # via paramiko -distro==1.5.0 # via docker-compose -docker-compose==1.27.4 # via pytest-docker -docker[ssh]==4.4.0 # via docker-compose -dockerpty==0.4.1 # via docker-compose -docopt==0.6.2 # via coveralls, docker-compose -idna-ssl==1.1.0 # via -c requirements/_base.txt, aiohttp -idna==2.10 # via -c requirements/_base.txt, idna-ssl, requests, yarl -importlib-metadata==3.1.1 # via -c requirements/_base.txt, jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -jsonschema==3.2.0 # via -c requirements/_base.txt, docker-compose -lazy-object-proxy==1.4.3 # via -c requirements/_base.txt, astroid -mccabe==0.6.1 # via pylint -multidict==5.1.0 # via -c requirements/_base.txt, aiohttp, yarl -packaging==20.7 # via pytest, pytest-sugar -paramiko==2.7.2 # via docker -pluggy==0.13.1 # via pytest -py==1.9.0 # via pytest -pycparser==2.20 # via cffi -pylint==2.6.0 # via -r requirements/_test.in -pynacl==1.4.0 # via paramiko -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via -c requirements/_base.txt, jsonschema -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-docker==0.10.1 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest-sugar==0.9.4 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-instafail, pytest-mock, pytest-sugar -python-dotenv==0.15.0 # via docker-compose -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, docker-compose -requests==2.25.0 # via coveralls, docker, docker-compose -six==1.15.0 # via -c requirements/_base.txt, astroid, bcrypt, cryptography, docker, dockerpty, jsonschema, pynacl, websocket-client -termcolor==1.1.0 # via pytest-sugar -texttable==1.6.3 # via docker-compose -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, aiohttp, yarl -urllib3==1.26.2 # via -c requirements/../../../requirements/constraints.txt, requests -websocket-client==0.57.0 # via docker, docker-compose -wrapt==1.12.1 # via astroid -yarl==1.6.3 # via -c requirements/_base.txt, aiohttp -zipp==3.4.0 # via -c requirements/_base.txt, importlib-metadata +aiohttp==3.7.3 + # via + # -c requirements/_base.txt + # pytest-aiohttp +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via + # -c requirements/_base.txt + # aiohttp +attrs==20.3.0 + # via + # -c requirements/_base.txt + # aiohttp + # jsonschema + # pytest + # pytest-docker +bcrypt==3.2.0 + # via paramiko +cached-property==1.5.2 + # via docker-compose +certifi==2020.12.5 + # via requests +cffi==1.14.5 + # via + # bcrypt + # cryptography + # pynacl +chardet==3.0.4 + # via + # -c requirements/_base.txt + # aiohttp + # requests +coverage==5.4 + # via + # -r requirements/_test.in + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +cryptography==3.4.5 + # via + # -c requirements/../../../requirements/constraints.txt + # paramiko +distro==1.5.0 + # via docker-compose +docker-compose==1.27.4 + # via + # -c requirements/../../../requirements/constraints.txt + # pytest-docker +docker[ssh]==4.4.1 + # via docker-compose +dockerpty==0.4.1 + # via docker-compose +docopt==0.6.2 + # via + # coveralls + # docker-compose +idna-ssl==1.1.0 + # via + # -c requirements/_base.txt + # aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # idna-ssl + # requests + # yarl +importlib-metadata==3.4.0 + # via + # -c requirements/_base.txt + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +jsonschema==3.2.0 + # via + # -c requirements/_base.txt + # docker-compose +lazy-object-proxy==1.4.3 + # via + # -c requirements/_base.txt + # astroid +mccabe==0.6.1 + # via pylint +multidict==5.1.0 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +packaging==20.9 + # via + # pytest + # pytest-sugar +paramiko==2.7.2 + # via docker +pluggy==0.13.1 + # via pytest +py==1.10.0 + # via pytest +pycparser==2.20 + # via cffi +pylint==2.6.0 + # via -r requirements/_test.in +pynacl==1.4.0 + # via paramiko +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via + # -c requirements/_base.txt + # jsonschema +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-docker==0.10.1 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest-sugar==0.9.4 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-docker + # pytest-instafail + # pytest-mock + # pytest-sugar +python-dotenv==0.15.0 + # via docker-compose +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # docker-compose +requests==2.25.1 + # via + # coveralls + # docker + # docker-compose +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid + # bcrypt + # docker + # dockerpty + # jsonschema + # pynacl + # websocket-client +termcolor==1.1.0 + # via pytest-sugar +texttable==1.6.3 + # via docker-compose +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # aiohttp + # importlib-metadata + # yarl +urllib3==1.26.3 + # via + # -c requirements/../../../requirements/constraints.txt + # requests +websocket-client==0.57.0 + # via + # docker + # docker-compose +wrapt==1.12.1 + # via astroid +yarl==1.6.3 + # via + # -c requirements/_base.txt + # aiohttp +zipp==3.4.0 + # via + # -c requirements/_base.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/service-library/requirements/_tools.txt b/packages/service-library/requirements/_tools.txt index 9217ccdd770..ff7d98bd0b4 100644 --- a/packages/service-library/requirements/_tools.txt +++ b/packages/service-library/requirements/_tools.txt @@ -4,31 +4,90 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via black, pip-tools -dataclasses==0.8 # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, -c requirements/_test.txt, pre-commit -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -zipp==3.4.0 # via -c requirements/_base.txt, -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # black + # pip-tools +dataclasses==0.8 + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.4.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # importlib-metadata +virtualenv==20.4.2 + # via pre-commit +zipp==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index b954e46a8e3..d3c22f34480 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -4,51 +4,177 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aiodebug==1.1.2 # via -r requirements/../../../packages/service-library/requirements/_base.in -aiofiles==0.6.0 # via -r requirements/_base.in -aiohttp==3.7.3 # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiozipkin -aiopg[sa]==1.1.0 # via -r requirements/../../../packages/service-library/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/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in -async-timeout==3.0.1 # via aiohttp -attrs==20.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiohttp, jsonschema, openapi-core -certifi==2020.12.5 # via minio -chardet==3.0.4 # via aiohttp -configparser==5.0.1 # via minio -dataclasses==0.8 # via pydantic -decorator==4.4.2 # via networkx -dnspython==2.0.0 # via email-validator -email-validator==1.1.2 # via pydantic -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via email-validator, idna-ssl, yarl -importlib-metadata==3.1.1 # via jsonschema -isodate==0.6.0 # via openapi-core -jsonschema==3.2.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator -lazy-object-proxy==1.4.3 # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-core -minio==6.0.2 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/s3wrapper/requirements/_base.in -multidict==5.1.0 # via aiohttp, yarl -networkx==2.5 # via -r requirements/_base.in -openapi-core==0.12.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -openapi-spec-validator==0.2.9 # via openapi-core -prometheus-client==0.9.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -psycopg2-binary==2.8.6 # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiopg, sqlalchemy -pydantic[email]==1.7.3 # via -r requirements/../../../packages/models-library/requirements/_base.in, -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -pyrsistent==0.17.3 # via jsonschema -python-dateutil==2.8.1 # via minio -pytz==2020.4 # via minio -pyyaml==5.3.1 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator, trafaret-config -six==1.15.0 # via isodate, jsonschema, openapi-core, openapi-spec-validator, python-dateutil, tenacity -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/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, aiopg -strict-rfc3339==0.7 # via openapi-core -tenacity==6.2.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -tqdm==4.54.1 # via -r requirements/_base.in -trafaret-config==2.0.2 # via -r requirements/_base.in -trafaret==2.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, trafaret-config -typing-extensions==3.7.4.3 # via aiohttp, yarl -ujson==4.0.1 # via -r requirements/../../../packages/service-library/requirements/_base.in -urllib3==1.26.2 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/s3wrapper/requirements/_base.in, minio -werkzeug==1.0.1 # via -r requirements/../../../packages/service-library/requirements/_base.in -yarl==1.6.3 # via -r requirements/../../../packages/postgres-database/requirements/_base.in, aiohttp -zipp==3.4.0 # via importlib-metadata +aiodebug==1.1.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in +aiofiles==0.6.0 + # via -r requirements/_base.in +aiohttp==3.7.3 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in + # aiozipkin +aiopg[sa]==1.1.0 + # via + # -r requirements/../../../packages/service-library/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/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/service-library/requirements/_base.in +async-timeout==3.0.1 + # via aiohttp +attrs==20.3.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in + # aiohttp + # jsonschema + # openapi-core +certifi==2020.12.5 + # via minio +chardet==3.0.4 + # via aiohttp +configparser==5.0.1 + # via minio +dataclasses==0.8 + # via pydantic +decorator==4.4.2 + # via networkx +dnspython==2.1.0 + # via email-validator +email-validator==1.1.2 + # via pydantic +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # email-validator + # idna-ssl + # yarl +importlib-metadata==3.4.0 + # via jsonschema +isodate==0.6.0 + # via openapi-core +jsonschema==3.2.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-spec-validator +lazy-object-proxy==1.4.3 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-core +minio==6.0.2 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/s3wrapper/requirements/_base.in +multidict==5.1.0 + # via + # aiohttp + # yarl +networkx==2.5 + # via -r requirements/_base.in +openapi-core==0.12.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +openapi-spec-validator==0.2.9 + # via openapi-core +prometheus-client==0.9.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +psycopg2-binary==2.8.6 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in + # aiopg + # sqlalchemy +pydantic[email]==1.7.3 + # via + # -r requirements/../../../packages/models-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +pyrsistent==0.17.3 + # via jsonschema +python-dateutil==2.8.1 + # via minio +pytz==2021.1 + # via minio +pyyaml==5.4.1 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-spec-validator + # trafaret-config +six==1.15.0 + # via + # isodate + # jsonschema + # openapi-core + # openapi-spec-validator + # python-dateutil + # tenacity +sqlalchemy[postgresql_psycopg2binary]==1.3.23 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/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 + # aiopg +strict-rfc3339==0.7 + # via openapi-core +tenacity==6.3.1 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +tqdm==4.56.2 + # via -r requirements/_base.in +trafaret-config==2.0.2 + # via -r requirements/_base.in +trafaret==2.1.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # trafaret-config +typing-extensions==3.7.4.3 + # via + # aiohttp + # importlib-metadata + # yarl +ujson==4.0.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in +urllib3==1.26.3 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/s3wrapper/requirements/_base.in + # minio +werkzeug==1.0.1 + # via -r requirements/../../../packages/service-library/requirements/_base.in +yarl==1.6.3 + # via + # -r requirements/../../../packages/postgres-database/requirements/_base.in + # aiohttp +zipp==3.4.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/simcore-sdk/requirements/_test.txt b/packages/simcore-sdk/requirements/_test.txt index eee9ec2777f..89d979d8970 100644 --- a/packages/simcore-sdk/requirements/_test.txt +++ b/packages/simcore-sdk/requirements/_test.txt @@ -4,60 +4,186 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.7.3 # via -c requirements/_base.txt, aioresponses, pytest-aiohttp -aioresponses==0.7.1 # via -r requirements/_test.in -alembic==1.4.3 # via -r requirements/_test.in -apipkg==1.5 # via execnet -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via -c requirements/_base.txt, aiohttp -attrs==20.3.0 # via -c requirements/_base.txt, aiohttp, pytest -certifi==2020.12.5 # via -c requirements/_base.txt, requests -chardet==3.0.4 # via -c requirements/_base.txt, aiohttp, requests -coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -docker==4.4.0 # via -r requirements/_test.in -docopt==0.6.2 # via coveralls -execnet==1.7.1 # via pytest-xdist -icdiff==1.9.1 # via pytest-icdiff -idna-ssl==1.1.0 # via -c requirements/_base.txt, aiohttp -idna==2.10 # via -c requirements/_base.txt, idna-ssl, requests, yarl -importlib-metadata==3.1.1 # via -c requirements/_base.txt, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -lazy-object-proxy==1.4.3 # via -c requirements/_base.txt, astroid -mako==1.1.3 # via alembic -markupsafe==1.1.1 # via mako -mccabe==0.6.1 # via pylint -multidict==5.1.0 # via -c requirements/_base.txt, aiohttp, yarl -packaging==20.7 # via pytest, pytest-sugar -pluggy==0.13.1 # via pytest -pprintpp==0.4.0 # via pytest-icdiff -psycopg2-binary==2.8.6 # via -c requirements/_base.txt, sqlalchemy -py==1.9.0 # via pytest, pytest-forked -pylint==2.6.0 # via -r requirements/_test.in -pyparsing==2.4.7 # via packaging -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-forked==1.3.0 # via pytest-xdist -pytest-icdiff==0.5 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest-sugar==0.9.4 # via -r requirements/_test.in -pytest-xdist==2.1.0 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-forked, pytest-icdiff, pytest-instafail, pytest-mock, pytest-sugar, pytest-xdist -python-dateutil==2.8.1 # via -c requirements/_base.txt, alembic -python-dotenv==0.15.0 # via -r requirements/_test.in -python-editor==1.0.4 # via alembic -requests==2.25.0 # via -r requirements/_test.in, coveralls, docker -six==1.15.0 # via -c requirements/_base.txt, astroid, docker, python-dateutil, websocket-client -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/_base.txt, alembic -termcolor==1.1.0 # via pytest-sugar -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, aiohttp, yarl -urllib3==1.26.2 # via -c requirements/_base.txt, requests -websocket-client==0.57.0 # via docker -wrapt==1.12.1 # via astroid -yarl==1.6.3 # via -c requirements/_base.txt, aiohttp -zipp==3.4.0 # via -c requirements/_base.txt, importlib-metadata +aiohttp==3.7.3 + # via + # -c requirements/_base.txt + # aioresponses + # pytest-aiohttp +aioresponses==0.7.1 + # via -r requirements/_test.in +alembic==1.5.4 + # via -r requirements/_test.in +apipkg==1.5 + # via execnet +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via + # -c requirements/_base.txt + # aiohttp +attrs==20.3.0 + # via + # -c requirements/_base.txt + # aiohttp + # pytest +certifi==2020.12.5 + # via + # -c requirements/_base.txt + # requests +chardet==3.0.4 + # via + # -c requirements/_base.txt + # aiohttp + # requests +coverage==5.4 + # via + # -r requirements/_test.in + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +docker==4.4.1 + # via -r requirements/_test.in +docopt==0.6.2 + # via coveralls +execnet==1.8.0 + # via pytest-xdist +icdiff==1.9.1 + # via pytest-icdiff +idna-ssl==1.1.0 + # via + # -c requirements/_base.txt + # aiohttp +idna==2.10 + # via + # -c requirements/_base.txt + # idna-ssl + # requests + # yarl +importlib-metadata==3.4.0 + # via + # -c requirements/_base.txt + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +lazy-object-proxy==1.4.3 + # via + # -c requirements/_base.txt + # astroid +mako==1.1.4 + # via alembic +markupsafe==1.1.1 + # via mako +mccabe==0.6.1 + # via pylint +multidict==5.1.0 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +packaging==20.9 + # via + # pytest + # pytest-sugar +pluggy==0.13.1 + # via pytest +pprintpp==0.4.0 + # via pytest-icdiff +psycopg2-binary==2.8.6 + # via + # -c requirements/_base.txt + # sqlalchemy +py==1.10.0 + # via + # pytest + # pytest-forked +pylint==2.6.0 + # via -r requirements/_test.in +pyparsing==2.4.7 + # via packaging +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-forked==1.3.0 + # via pytest-xdist +pytest-icdiff==0.5 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest-sugar==0.9.4 + # via -r requirements/_test.in +pytest-xdist==2.2.1 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-forked + # pytest-icdiff + # pytest-instafail + # pytest-mock + # pytest-sugar + # pytest-xdist +python-dateutil==2.8.1 + # via + # -c requirements/_base.txt + # alembic +python-dotenv==0.15.0 + # via -r requirements/_test.in +python-editor==1.0.4 + # via alembic +requests==2.25.1 + # via + # -r requirements/_test.in + # coveralls + # docker +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid + # docker + # python-dateutil + # websocket-client +sqlalchemy[postgresql_psycopg2binary]==1.3.23 + # via + # -c requirements/_base.txt + # alembic +termcolor==1.1.0 + # via pytest-sugar +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # aiohttp + # importlib-metadata + # yarl +urllib3==1.26.3 + # via + # -c requirements/_base.txt + # requests +websocket-client==0.57.0 + # via docker +wrapt==1.12.1 + # via astroid +yarl==1.6.3 + # via + # -c requirements/_base.txt + # aiohttp +zipp==3.4.0 + # via + # -c requirements/_base.txt + # importlib-metadata diff --git a/packages/simcore-sdk/requirements/_tools.txt b/packages/simcore-sdk/requirements/_tools.txt index 17b080dc9f0..ca384d002b7 100644 --- a/packages/simcore-sdk/requirements/_tools.txt +++ b/packages/simcore-sdk/requirements/_tools.txt @@ -4,31 +4,88 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via black, pip-tools -dataclasses==0.8 # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/_base.txt, pre-commit -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -zipp==3.4.0 # via -c requirements/_base.txt, -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # black + # pip-tools +dataclasses==0.8 + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.4.1 + # via + # -c requirements/_base.txt + # pre-commit +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # importlib-metadata +virtualenv==20.4.2 + # via pre-commit +zipp==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 8f79023c3a2..69d13d2bf3f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -29,3 +29,10 @@ respx<0.13.0 # Keeps all docker compose to the same version. TODO: remove when all synced docker-compose==1.27.4 + + +# requests==2.25.1->coveralls==3.0.0 Feb2021 +idna<3,>=2.5 + +# vulnerability https://github.com/advisories/GHSA-rhm9-p9w5-fwm7 Feb.2021 +cryptography>=3.3.2 diff --git a/requirements/tools/Dockerfile b/requirements/tools/Dockerfile index 05aa80cd778..4a1902b1dd4 100644 --- a/requirements/tools/Dockerfile +++ b/requirements/tools/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update \ RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/scripts/openapi/oas_resolver/Dockerfile b/scripts/openapi/oas_resolver/Dockerfile index 9339b3dae73..82a0ee028d9 100644 --- a/scripts/openapi/oas_resolver/Dockerfile +++ b/scripts/openapi/oas_resolver/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /src # update pip RUN pip install --no-cache-dir --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/api-server/Dockerfile b/services/api-server/Dockerfile index 074c78dd94b..fe1ac35683e 100644 --- a/services/api-server/Dockerfile +++ b/services/api-server/Dockerfile @@ -67,7 +67,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip install --no-cache-dir --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 2386c16c36f..0b68c275f08 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -34,8 +34,12 @@ click==7.1.2 # via uvicorn contextvars==2.4 # via sniffio -cryptography==3.3.1 - # via -r requirements/_base.in +cryptography==3.4.5 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in dataclasses==0.8 # via pydantic dnspython==2.1.0 @@ -70,6 +74,9 @@ httpx==0.14.3 # -r requirements/_base.in idna==2.10 # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt # email-validator # requests # rfc3986 @@ -128,7 +135,6 @@ rx==1.6.1 # via graphql-core six==1.15.0 # via - # cryptography # graphene # graphql-core # graphql-relay diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 142c32f3518..dde3425fcca 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -alembic==1.5.3 +alembic==1.5.4 # via -r requirements/_test.in asgi-lifespan==1.0.1 # via -r requirements/_test.in @@ -59,8 +59,10 @@ coverage==5.4 # pytest-cov coveralls==3.0.0 # via -r requirements/_test.in -cryptography==3.3.1 +cryptography==3.4.5 # via + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # paramiko distro==1.5.0 @@ -80,7 +82,7 @@ docopt==0.6.2 # via # coveralls # docker-compose -faker==5.8.0 +faker==6.1.1 # via -r requirements/_test.in h11==0.9.0 # via @@ -98,6 +100,8 @@ httpx==0.14.3 # respx idna==2.10 # via + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # requests # rfc3986 @@ -169,7 +173,7 @@ pytest-docker==0.10.1 # via -r requirements/_test.in pytest-mock==3.5.1 # via -r requirements/_test.in -pytest-runner==5.2 +pytest-runner==5.3.0 # via -r requirements/_test.in pytest==6.2.2 # via @@ -215,7 +219,6 @@ six==1.15.0 # -c requirements/_base.txt # astroid # bcrypt - # cryptography # docker # dockerpty # jsonschema diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index c3886759e1c..ee2d09b69a2 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -65,7 +65,7 @@ pathspec==0.8.1 # via black pip-tools==5.5.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.10.0 +pre-commit==2.10.1 # via -r requirements/../../../requirements/devenv.txt ptvsd==4.3.2 # via -r requirements/_tools.in @@ -100,7 +100,7 @@ typing-extensions==3.7.4.3 # importlib-metadata virtualenv==20.4.2 # via pre-commit -watchdog[watchmedo]==1.0.2 +watchdog[watchmedo]==2.0.0 # via -r requirements/_tools.in zipp==3.4.0 # via diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile index 35ee7377514..105af1fa0f1 100644 --- a/services/catalog/Dockerfile +++ b/services/catalog/Dockerfile @@ -67,7 +67,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip install --no-cache-dir --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/catalog/requirements/_base.in b/services/catalog/requirements/_base.in index 885cc409c58..42dacf2ece9 100644 --- a/services/catalog/requirements/_base.in +++ b/services/catalog/requirements/_base.in @@ -12,8 +12,9 @@ pyyaml # fastapi and extensions fastapi[all] -async-exit-stack # not needed when python>=3.7 -async-generator # not needed when python>=3.7 +async-exit-stack; python_version < '3.7' +async-generator ; python_version < '3.7' +dataclasses ; python_version < '3.7' # data models pydantic[dotenv] diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index 418cc83a00d..9d8200e74bb 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -4,51 +4,154 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aiofiles==0.5.0 # via fastapi -aiopg[sa]==1.0.0 # via -r requirements/_base.in -aniso8601==7.0.0 # via graphene -async-exit-stack==1.0.1 # via -r requirements/_base.in, fastapi -async-generator==1.10 # via -r requirements/_base.in, fastapi -certifi==2020.6.20 # via httpx, requests -chardet==3.0.4 # via httpx, requests -click==7.1.2 # via uvicorn -contextvars==2.4 # via sniffio -dataclasses==0.7 # via pydantic -dnspython==2.0.0 # via email-validator -email-validator==1.1.1 # via fastapi, pydantic -fastapi[all]==0.61.1 # via -r requirements/_base.in -graphene==2.1.8 # via fastapi -graphql-core==2.3.2 # via graphene, graphql-relay -graphql-relay==2.0.1 # via graphene -h11==0.9.0 # via httpcore, uvicorn -httpcore==0.10.2 # via httpx -httptools==0.1.1 # via uvicorn -httpx==0.14.3 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in -idna==2.10 # via email-validator, requests, rfc3986, yarl -immutables==0.14 # via contextvars -itsdangerous==1.1.0 # via fastapi -jinja2==2.11.2 # via fastapi -markupsafe==1.1.1 # via jinja2 -multidict==4.7.6 # via yarl -orjson==3.3.1 # via fastapi -promise==2.3 # via graphql-core, graphql-relay -psycopg2-binary==2.8.6 # via aiopg, sqlalchemy -pydantic[dotenv,email]==1.7.2 # via -r requirements/../../../packages/models-library/requirements/_base.in, -r requirements/_base.in, fastapi -python-dotenv==0.14.0 # via pydantic -python-multipart==0.0.5 # via fastapi -pyyaml==5.3.1 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in, fastapi -requests==2.24.0 # via fastapi -rfc3986[idna2008]==1.4.0 # via httpx -rx==1.6.1 # via graphql-core -six==1.15.0 # via graphene, graphql-core, graphql-relay, python-multipart, tenacity -sniffio==1.1.0 # via httpcore, httpx -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/postgres-database/requirements/_base.in, aiopg -starlette==0.13.6 # via fastapi -tenacity==6.2.0 # via -r requirements/_base.in -typing-extensions==3.7.4.3 # via yarl -ujson==3.2.0 # via fastapi -urllib3==1.25.11 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, requests -uvicorn==0.11.8 # via fastapi -uvloop==0.14.0 # via uvicorn -websockets==8.1 # via uvicorn -yarl==1.5.1 # via -r requirements/../../../packages/postgres-database/requirements/_base.in +aiofiles==0.5.0 + # via fastapi +aiopg[sa]==1.0.0 + # via -r requirements/_base.in +aniso8601==7.0.0 + # via graphene +async-exit-stack==1.0.1 ; python_version < "3.7" + # via + # -r requirements/_base.in + # fastapi +async-generator==1.10 ; python_version < "3.7" + # via + # -r requirements/_base.in + # fastapi +certifi==2020.6.20 + # via + # httpx + # requests +chardet==3.0.4 + # via + # httpx + # requests +click==7.1.2 + # via uvicorn +contextvars==2.4 + # via sniffio +dataclasses==0.7 ; python_version < "3.7" + # via + # -r requirements/_base.in + # pydantic +dnspython==2.0.0 + # via email-validator +email-validator==1.1.1 + # via + # fastapi + # pydantic +fastapi[all]==0.61.1 + # via -r requirements/_base.in +graphene==2.1.8 + # via fastapi +graphql-core==2.3.2 + # via + # graphene + # graphql-relay +graphql-relay==2.0.1 + # via graphene +h11==0.9.0 + # via + # httpcore + # uvicorn +httpcore==0.10.2 + # via httpx +httptools==0.1.1 + # via uvicorn +httpx==0.14.3 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in +idna==2.10 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # email-validator + # requests + # rfc3986 + # yarl +immutables==0.14 + # via contextvars +itsdangerous==1.1.0 + # via fastapi +jinja2==2.11.2 + # via fastapi +markupsafe==1.1.1 + # via jinja2 +multidict==4.7.6 + # via yarl +orjson==3.3.1 + # via fastapi +promise==2.3 + # via + # graphql-core + # graphql-relay +psycopg2-binary==2.8.6 + # via + # aiopg + # sqlalchemy +pydantic[dotenv,email]==1.7.2 + # via + # -r requirements/../../../packages/models-library/requirements/_base.in + # -r requirements/_base.in + # fastapi +python-dotenv==0.14.0 + # via pydantic +python-multipart==0.0.5 + # via fastapi +pyyaml==5.3.1 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in + # fastapi +requests==2.24.0 + # via fastapi +rfc3986[idna2008]==1.4.0 + # via httpx +rx==1.6.1 + # via graphql-core +six==1.15.0 + # via + # graphene + # graphql-core + # graphql-relay + # python-multipart + # tenacity +sniffio==1.1.0 + # via + # httpcore + # httpx +sqlalchemy[postgresql_psycopg2binary]==1.3.20 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/postgres-database/requirements/_base.in + # aiopg +starlette==0.13.6 + # via fastapi +tenacity==6.2.0 + # via -r requirements/_base.in +typing-extensions==3.7.4.3 + # via yarl +ujson==3.2.0 + # via fastapi +urllib3==1.25.11 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # requests +uvicorn==0.11.8 + # via fastapi +uvloop==0.14.0 + # via uvicorn +websockets==8.1 + # via uvicorn +yarl==1.5.1 + # via -r requirements/../../../packages/postgres-database/requirements/_base.in diff --git a/services/catalog/requirements/_test.in b/services/catalog/requirements/_test.in index b329f363b37..beb14a700f9 100644 --- a/services/catalog/requirements/_test.in +++ b/services/catalog/requirements/_test.in @@ -27,6 +27,7 @@ respx # migration due to pytest_simcore.postgres_service alembic docker +click # tools pylint diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index 0d425bfe5b8..126ad78e47d 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -4,79 +4,259 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.7.3 # via pytest-aiohttp -alembic==1.4.3 # via -r requirements/_test.in -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via aiohttp -attrs==20.3.0 # via aiohttp, jsonschema, pytest, pytest-docker -bcrypt==3.2.0 # via paramiko -cached-property==1.5.2 # via docker-compose -certifi==2020.6.20 # via -c requirements/_base.txt, httpx, requests -cffi==1.14.4 # via bcrypt, cryptography, pynacl -chardet==3.0.4 # via -c requirements/_base.txt, aiohttp, httpx, requests -codecov==2.1.10 # via -r requirements/_test.in -contextvars==2.4 # via -c requirements/_base.txt, sniffio -coverage==5.3 # via codecov, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -cryptography==3.3.1 # via paramiko -distro==1.5.0 # via docker-compose -docker-compose==1.27.4 # via pytest-docker -docker[ssh]==4.4.0 # via -r requirements/_test.in, docker-compose -dockerpty==0.4.1 # via docker-compose -docopt==0.6.2 # via coveralls, docker-compose -faker==5.0.1 # via -r requirements/_test.in -h11==0.9.0 # via -c requirements/_base.txt, httpcore -httpcore==0.10.2 # via -c requirements/_base.txt, httpx -httpx==0.14.3 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, respx -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via -c requirements/_base.txt, idna-ssl, requests, rfc3986, yarl -immutables==0.14 # via -c requirements/_base.txt, contextvars -importlib-metadata==3.1.1 # via jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -jsonschema==3.2.0 # via -r requirements/_test.in, docker-compose -lazy-object-proxy==1.4.3 # via astroid -mako==1.1.3 # via alembic -markupsafe==1.1.1 # via -c requirements/_base.txt, mako -mccabe==0.6.1 # via pylint -multidict==4.7.6 # via -c requirements/_base.txt, aiohttp, yarl -packaging==20.7 # via pytest -paramiko==2.7.2 # via docker -pluggy==0.13.1 # via pytest -psycopg2-binary==2.8.6 # via -c requirements/_base.txt, sqlalchemy -ptvsd==4.3.2 # via -r requirements/_test.in -py==1.9.0 # via pytest -pycparser==2.20 # via cffi -pylint==2.6.0 # via -r requirements/_test.in -pynacl==1.4.0 # via paramiko -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via jsonschema -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-docker==0.10.1 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-mock -python-dateutil==2.8.1 # via alembic, faker -python-dotenv==0.14.0 # via -c requirements/_base.txt, docker-compose -python-editor==1.0.4 # via alembic -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, docker-compose -requests==2.24.0 # via -c requirements/_base.txt, codecov, coveralls, docker, docker-compose -respx==0.12.1 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_test.in -rfc3986[idna2008]==1.4.0 # via -c requirements/_base.txt, httpx -six==1.15.0 # via -c requirements/_base.txt, astroid, bcrypt, cryptography, docker, dockerpty, jsonschema, pynacl, python-dateutil, websocket-client -sniffio==1.1.0 # via -c requirements/_base.txt, httpcore, httpx -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, alembic -text-unidecode==1.3 # via faker -texttable==1.6.3 # via docker-compose -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, aiohttp, yarl -urllib3==1.25.11 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, requests -websocket-client==0.57.0 # via docker, docker-compose -wrapt==1.12.1 # via astroid -yarl==1.5.1 # via -c requirements/_base.txt, aiohttp -zipp==3.4.0 # via importlib-metadata +aiohttp==3.7.3 + # via pytest-aiohttp +alembic==1.5.4 + # via -r requirements/_test.in +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via aiohttp +attrs==20.3.0 + # via + # aiohttp + # jsonschema + # pytest + # pytest-docker +bcrypt==3.2.0 + # via paramiko +cached-property==1.5.2 + # via docker-compose +certifi==2020.6.20 + # via + # -c requirements/_base.txt + # httpx + # requests +cffi==1.14.5 + # via + # bcrypt + # cryptography + # pynacl +chardet==3.0.4 + # via + # -c requirements/_base.txt + # aiohttp + # httpx + # requests +click==7.1.2 + # via + # -c requirements/_base.txt + # -r requirements/_test.in +codecov==2.1.11 + # via -r requirements/_test.in +contextvars==2.4 + # via + # -c requirements/_base.txt + # sniffio +coverage==5.4 + # via + # codecov + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +cryptography==3.4.5 + # via + # -c requirements/../../../requirements/constraints.txt + # paramiko +distro==1.5.0 + # via docker-compose +docker-compose==1.27.4 + # via + # -c requirements/../../../requirements/constraints.txt + # pytest-docker +docker[ssh]==4.4.1 + # via + # -r requirements/_test.in + # docker-compose +dockerpty==0.4.1 + # via docker-compose +docopt==0.6.2 + # via + # coveralls + # docker-compose +faker==6.1.1 + # via -r requirements/_test.in +h11==0.9.0 + # via + # -c requirements/_base.txt + # httpcore +httpcore==0.10.2 + # via + # -c requirements/_base.txt + # httpx +httpx==0.14.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # respx +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # idna-ssl + # requests + # rfc3986 + # yarl +immutables==0.14 + # via + # -c requirements/_base.txt + # contextvars +importlib-metadata==3.4.0 + # via + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +jsonschema==3.2.0 + # via + # -r requirements/_test.in + # docker-compose +lazy-object-proxy==1.4.3 + # via astroid +mako==1.1.4 + # via alembic +markupsafe==1.1.1 + # via + # -c requirements/_base.txt + # mako +mccabe==0.6.1 + # via pylint +multidict==4.7.6 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +packaging==20.9 + # via pytest +paramiko==2.7.2 + # via docker +pluggy==0.13.1 + # via pytest +psycopg2-binary==2.8.6 + # via + # -c requirements/_base.txt + # sqlalchemy +ptvsd==4.3.2 + # via -r requirements/_test.in +py==1.10.0 + # via pytest +pycparser==2.20 + # via cffi +pylint==2.6.0 + # via -r requirements/_test.in +pynacl==1.4.0 + # via paramiko +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via jsonschema +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-docker==0.10.1 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-docker + # pytest-mock +python-dateutil==2.8.1 + # via + # alembic + # faker +python-dotenv==0.14.0 + # via + # -c requirements/_base.txt + # docker-compose +python-editor==1.0.4 + # via alembic +pyyaml==5.3.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # docker-compose +requests==2.24.0 + # via + # -c requirements/_base.txt + # codecov + # coveralls + # docker + # docker-compose +respx==0.12.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_test.in +rfc3986[idna2008]==1.4.0 + # via + # -c requirements/_base.txt + # httpx +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid + # bcrypt + # docker + # dockerpty + # jsonschema + # pynacl + # python-dateutil + # websocket-client +sniffio==1.1.0 + # via + # -c requirements/_base.txt + # httpcore + # httpx +sqlalchemy[postgresql_psycopg2binary]==1.3.20 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # alembic +text-unidecode==1.3 + # via faker +texttable==1.6.3 + # via docker-compose +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # aiohttp + # importlib-metadata + # yarl +urllib3==1.25.11 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # requests +websocket-client==0.57.0 + # via + # docker + # docker-compose +wrapt==1.12.1 + # via astroid +yarl==1.5.1 + # via + # -c requirements/_base.txt + # aiohttp +zipp==3.4.0 + # via importlib-metadata # 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 a019026d03c..226622e5875 100644 --- a/services/catalog/requirements/_tools.txt +++ b/services/catalog/requirements/_tools.txt @@ -4,33 +4,94 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -argh==0.26.2 # via watchdog -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via -c requirements/_base.txt, black, pip-tools -dataclasses==0.7 # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, watchdog -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -watchdog[watchmedo]==1.0.0 # via -r requirements/_tools.in -zipp==3.4.0 # via -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +argh==0.26.2 + # via watchdog +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # pip-tools +dataclasses==0.7 ; python_version < "3.7" + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.4.0 + # via + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.3.1 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # watchdog +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # importlib-metadata +virtualenv==20.4.2 + # via pre-commit +watchdog[watchmedo]==2.0.0 + # via -r requirements/_tools.in +zipp==3.4.0 + # via + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/services/catalog/requirements/dev.txt b/services/catalog/requirements/dev.txt index 3cad5fd42f3..696789999f7 100644 --- a/services/catalog/requirements/dev.txt +++ b/services/catalog/requirements/dev.txt @@ -13,7 +13,7 @@ # installs this repo's packages -e ../../packages/models-library --e ../../packages/postgres-database/[migration] +-e ../../packages/postgres-database -e ../../packages/pytest-simcore/ # installs current package diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile index 005718a177e..aa09596a3ba 100644 --- a/services/director-v2/Dockerfile +++ b/services/director-v2/Dockerfile @@ -68,7 +68,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index 3660b742474..162c5d02226 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -4,71 +4,195 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aiodocker==0.19.1 # via -r requirements/_base.in -aiofiles==0.5.0 # via fastapi -aiohttp==3.7.3 # via aiodocker -aiopg[sa]==1.0.0 # via -r requirements/_base.in -amqp==5.0.2 # via kombu -aniso8601==7.0.0 # via graphene -async-exit-stack==1.0.1 ; python_version < "3.7" # via -r requirements/_base.in, fastapi -async-generator==1.10 ; python_version < "3.7" # via -r requirements/_base.in, fastapi -async-timeout==3.0.1 # via aiohttp -attrs==20.3.0 # via aiohttp -billiard==3.6.3.0 # via celery -celery[redis]==5.0.2 # via -r requirements/_base.in -certifi==2020.11.8 # via httpx, requests -chardet==3.0.4 # via aiohttp, httpx, requests -click-didyoumean==0.0.3 # via celery -click-repl==0.1.6 # via celery -click==7.1.2 # via celery, click-didyoumean, click-repl, uvicorn -contextvars==2.4 # via sniffio -dataclasses==0.7 ; python_version < "3.7" # via -r requirements/_base.in, pydantic -decorator==4.4.2 # via networkx -dnspython==2.0.0 # via email-validator -email-validator==1.1.2 # via fastapi -fastapi[all]==0.61.2 # via -r requirements/_base.in -graphene==2.1.8 # via fastapi -graphql-core==2.3.2 # via graphene, graphql-relay -graphql-relay==2.0.1 # via graphene -h11==0.9.0 # via httpcore, uvicorn -httpcore==0.10.2 # via httpx -httptools==0.1.1 # via uvicorn -httpx==0.14.3 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via email-validator, idna-ssl, requests, rfc3986, yarl -immutables==0.14 # via contextvars -importlib-metadata==2.0.0 # via kombu -itsdangerous==1.1.0 # via fastapi -jinja2==2.11.2 # via fastapi -kombu==5.0.2 # via celery -markupsafe==1.1.1 # via jinja2 -multidict==5.0.0 # via aiohttp, yarl -networkx==2.5 # via -r requirements/_base.in -orjson==3.4.3 # via -r requirements/_base.in, fastapi -promise==2.3 # via graphql-core, graphql-relay -prompt-toolkit==3.0.8 # via click-repl -psycopg2-binary==2.8.6 # via aiopg, sqlalchemy -pydantic[dotenv]==1.7.2 # via -r requirements/_base.in, fastapi -python-dotenv==0.15.0 # via pydantic -python-multipart==0.0.5 # via fastapi -pytz==2020.4 # via celery -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, fastapi -redis==3.5.3 # via celery -requests==2.24.0 # via fastapi -rfc3986[idna2008]==1.4.0 # via httpx -rx==1.6.1 # via graphql-core -six==1.15.0 # via click-repl, graphene, graphql-core, graphql-relay, python-multipart, tenacity -sniffio==1.2.0 # via httpcore, httpx -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../requirements/constraints.txt, aiopg -starlette==0.13.6 # via fastapi -tenacity==6.2.0 # via -r requirements/_base.in -typing-extensions==3.7.4.3 # via aiodocker, aiohttp, yarl -ujson==3.2.0 # via fastapi -urllib3==1.25.11 # via -c requirements/../../../requirements/constraints.txt, requests -uvicorn==0.11.8 # via fastapi -uvloop==0.14.0 # via uvicorn -vine==5.0.0 # via amqp, celery -wcwidth==0.2.5 # via prompt-toolkit -websockets==8.1 # via uvicorn -yarl==1.6.2 # via aiohttp -zipp==3.4.0 # via importlib-metadata +aiodocker==0.19.1 + # via -r requirements/_base.in +aiofiles==0.5.0 + # via fastapi +aiohttp==3.7.3 + # via aiodocker +aiopg[sa]==1.0.0 + # via -r requirements/_base.in +amqp==5.0.2 + # via kombu +aniso8601==7.0.0 + # via graphene +async-exit-stack==1.0.1 ; python_version < "3.7" + # via + # -r requirements/_base.in + # fastapi +async-generator==1.10 ; python_version < "3.7" + # via + # -r requirements/_base.in + # fastapi +async-timeout==3.0.1 + # via aiohttp +attrs==20.3.0 + # via aiohttp +billiard==3.6.3.0 + # via celery +celery[redis]==5.0.2 + # via -r requirements/_base.in +certifi==2020.11.8 + # via + # httpx + # requests +chardet==3.0.4 + # via + # aiohttp + # httpx + # requests +click-didyoumean==0.0.3 + # via celery +click-repl==0.1.6 + # via celery +click==7.1.2 + # via + # celery + # click-didyoumean + # click-repl + # uvicorn +contextvars==2.4 + # via sniffio +dataclasses==0.7 ; python_version < "3.7" + # via + # -r requirements/_base.in + # pydantic +decorator==4.4.2 + # via networkx +dnspython==2.0.0 + # via email-validator +email-validator==1.1.2 + # via fastapi +fastapi[all]==0.61.2 + # via -r requirements/_base.in +graphene==2.1.8 + # via fastapi +graphql-core==2.3.2 + # via + # graphene + # graphql-relay +graphql-relay==2.0.1 + # via graphene +h11==0.9.0 + # via + # httpcore + # uvicorn +httpcore==0.10.2 + # via httpx +httptools==0.1.1 + # via uvicorn +httpx==0.14.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # email-validator + # idna-ssl + # requests + # rfc3986 + # yarl +immutables==0.14 + # via contextvars +importlib-metadata==2.0.0 + # via kombu +itsdangerous==1.1.0 + # via fastapi +jinja2==2.11.2 + # via fastapi +kombu==5.0.2 + # via celery +markupsafe==1.1.1 + # via jinja2 +multidict==5.0.0 + # via + # aiohttp + # yarl +networkx==2.5 + # via -r requirements/_base.in +orjson==3.4.3 + # via + # -r requirements/_base.in + # fastapi +promise==2.3 + # via + # graphql-core + # graphql-relay +prompt-toolkit==3.0.8 + # via click-repl +psycopg2-binary==2.8.6 + # via + # aiopg + # sqlalchemy +pydantic[dotenv]==1.7.2 + # via + # -r requirements/_base.in + # fastapi +python-dotenv==0.15.0 + # via pydantic +python-multipart==0.0.5 + # via fastapi +pytz==2020.4 + # via celery +pyyaml==5.3.1 + # via + # -c requirements/../../../requirements/constraints.txt + # fastapi +redis==3.5.3 + # via celery +requests==2.24.0 + # via fastapi +rfc3986[idna2008]==1.4.0 + # via httpx +rx==1.6.1 + # via graphql-core +six==1.15.0 + # via + # click-repl + # graphene + # graphql-core + # graphql-relay + # python-multipart + # tenacity +sniffio==1.2.0 + # via + # httpcore + # httpx +sqlalchemy[postgresql_psycopg2binary]==1.3.20 + # via + # -c requirements/../../../requirements/constraints.txt + # aiopg +starlette==0.13.6 + # via fastapi +tenacity==6.2.0 + # via -r requirements/_base.in +typing-extensions==3.7.4.3 + # via + # aiodocker + # aiohttp + # yarl +ujson==3.2.0 + # via fastapi +urllib3==1.25.11 + # via + # -c requirements/../../../requirements/constraints.txt + # requests +uvicorn==0.11.8 + # via fastapi +uvloop==0.14.0 + # via uvicorn +vine==5.0.0 + # via + # amqp + # celery +wcwidth==0.2.5 + # via prompt-toolkit +websockets==8.1 + # via uvicorn +yarl==1.6.2 + # via aiohttp +zipp==3.4.0 + # via importlib-metadata diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index b3e1278622a..8aa825ff090 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -4,104 +4,349 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aio-pika==6.7.1 # via -r requirements/_test.in -aiohttp==3.7.3 # via -c requirements/_base.txt, pytest-aiohttp -aioredis==1.3.1 # via -r requirements/_test.in -aiormq==3.3.1 # via aio-pika -alembic==1.4.3 # via -r requirements/_test.in -amqp==5.0.2 # via -c requirements/_base.txt, kombu -apipkg==1.5 # via execnet -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via -c requirements/_base.txt, aiohttp, aioredis -attrs==20.3.0 # via -c requirements/_base.txt, aiohttp, jsonschema, pytest, pytest-docker -bcrypt==3.2.0 # via paramiko -billiard==3.6.3.0 # via -c requirements/_base.txt, celery -cached-property==1.5.2 # via docker-compose -celery[redis]==5.0.2 # via -c requirements/_base.txt, pytest-celery -certifi==2020.11.8 # via -c requirements/_base.txt, httpx, requests -cffi==1.14.4 # via bcrypt, cryptography, pynacl -chardet==3.0.4 # via -c requirements/_base.txt, aiohttp, httpx, requests -click-didyoumean==0.0.3 # via -c requirements/_base.txt, celery -click-repl==0.1.6 # via -c requirements/_base.txt, celery -click==7.1.2 # via -c requirements/_base.txt, celery, click-didyoumean, click-repl -codecov==2.1.10 # via -r requirements/_test.in -contextvars==2.4 # via -c requirements/_base.txt, sniffio -coverage==5.3 # via codecov, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -cryptography==3.3.1 # via paramiko -distro==1.5.0 # via docker-compose -docker-compose==1.27.4 # via pytest-docker -docker[ssh]==4.4.0 # via -r requirements/_test.in, docker-compose -dockerpty==0.4.1 # via docker-compose -docopt==0.6.2 # via coveralls, docker-compose -execnet==1.7.1 # via pytest-xdist -faker==5.0.1 # via -r requirements/_test.in -h11==0.9.0 # via -c requirements/_base.txt, httpcore -hiredis==1.1.0 # via aioredis -httpcore==0.10.2 # via -c requirements/_base.txt, httpx -httpx==0.14.3 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, respx -icdiff==1.9.1 # via pytest-icdiff -idna-ssl==1.1.0 # via -c requirements/_base.txt, aiohttp -idna==2.10 # via -c requirements/_base.txt, idna-ssl, requests, rfc3986, yarl -immutables==0.14 # via -c requirements/_base.txt, contextvars -importlib-metadata==2.0.0 # via -c requirements/_base.txt, jsonschema, kombu, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -jsonschema==3.2.0 # via docker-compose -kombu==5.0.2 # via -c requirements/_base.txt, celery -lazy-object-proxy==1.4.3 # via astroid -mako==1.1.3 # via alembic -markupsafe==1.1.1 # via -c requirements/_base.txt, mako -mccabe==0.6.1 # via pylint -multidict==5.0.0 # via -c requirements/_base.txt, aiohttp, yarl -packaging==20.7 # via pytest -pamqp==2.3.0 # via aiormq -paramiko==2.7.2 # via docker -pluggy==0.13.1 # via pytest -pprintpp==0.4.0 # via pytest-icdiff -prompt-toolkit==3.0.8 # via -c requirements/_base.txt, click-repl -psycopg2-binary==2.8.6 # via -c requirements/_base.txt, sqlalchemy -ptvsd==4.3.2 # via -r requirements/_test.in -py==1.9.0 # via pytest, pytest-forked -pycparser==2.20 # via cffi -pylint==2.6.0 # via -r requirements/_test.in -pynacl==1.4.0 # via paramiko -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via jsonschema -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-celery==0.0.0a1 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-docker==0.10.1 # via -r requirements/_test.in -pytest-forked==1.3.0 # via pytest-xdist -pytest-icdiff==0.5 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest-xdist==2.1.0 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-forked, pytest-icdiff, pytest-mock, pytest-xdist -python-dateutil==2.8.1 # via alembic, faker -python-dotenv==0.15.0 # via -c requirements/_base.txt, docker-compose -python-editor==1.0.4 # via alembic -pytz==2020.4 # via -c requirements/_base.txt, celery -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, docker-compose -redis==3.5.3 # via -c requirements/_base.txt, celery -requests==2.24.0 # via -c requirements/_base.txt, codecov, coveralls, docker, docker-compose -respx==0.12.1 # via -c requirements/../../../requirements/constraints.txt, -r requirements/_test.in -rfc3986[idna2008]==1.4.0 # via -c requirements/_base.txt, httpx -six==1.15.0 # via -c requirements/_base.txt, astroid, bcrypt, click-repl, cryptography, docker, dockerpty, jsonschema, pynacl, python-dateutil, websocket-client -sniffio==1.2.0 # via -c requirements/_base.txt, httpcore, httpx -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, alembic -text-unidecode==1.3 # via faker -texttable==1.6.3 # via docker-compose -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, aiohttp, yarl -urllib3==1.25.11 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, requests -vine==5.0.0 # via -c requirements/_base.txt, amqp, celery -wcwidth==0.2.5 # via -c requirements/_base.txt, prompt-toolkit -websocket-client==0.57.0 # via docker, docker-compose -wrapt==1.12.1 # via astroid -yarl==1.6.2 # via -c requirements/_base.txt, aio-pika, aiohttp, aiormq -zipp==3.4.0 # via -c requirements/_base.txt, importlib-metadata +aio-pika==6.7.1 + # via -r requirements/_test.in +aiohttp==3.7.3 + # via + # -c requirements/_base.txt + # pytest-aiohttp +aioredis==1.3.1 + # via -r requirements/_test.in +aiormq==3.3.1 + # via aio-pika +alembic==1.5.4 + # via -r requirements/_test.in +amqp==5.0.2 + # via + # -c requirements/_base.txt + # kombu +apipkg==1.5 + # via execnet +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via + # -c requirements/_base.txt + # aiohttp + # aioredis +attrs==20.3.0 + # via + # -c requirements/_base.txt + # aiohttp + # jsonschema + # pytest + # pytest-docker +bcrypt==3.2.0 + # via paramiko +billiard==3.6.3.0 + # via + # -c requirements/_base.txt + # celery +cached-property==1.5.2 + # via docker-compose +celery[redis]==5.0.2 + # via + # -c requirements/_base.txt + # pytest-celery +certifi==2020.11.8 + # via + # -c requirements/_base.txt + # httpx + # requests +cffi==1.14.5 + # via + # bcrypt + # cryptography + # pynacl +chardet==3.0.4 + # via + # -c requirements/_base.txt + # aiohttp + # httpx + # requests +click-didyoumean==0.0.3 + # via + # -c requirements/_base.txt + # celery +click-repl==0.1.6 + # via + # -c requirements/_base.txt + # celery +click==7.1.2 + # via + # -c requirements/_base.txt + # celery + # click-didyoumean + # click-repl +codecov==2.1.11 + # via -r requirements/_test.in +contextvars==2.4 + # via + # -c requirements/_base.txt + # sniffio +coverage==5.4 + # via + # codecov + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +cryptography==3.4.5 + # via + # -c requirements/../../../requirements/constraints.txt + # paramiko +distro==1.5.0 + # via docker-compose +docker-compose==1.27.4 + # via + # -c requirements/../../../requirements/constraints.txt + # pytest-docker +docker[ssh]==4.4.1 + # via + # -r requirements/_test.in + # docker-compose +dockerpty==0.4.1 + # via docker-compose +docopt==0.6.2 + # via + # coveralls + # docker-compose +execnet==1.8.0 + # via pytest-xdist +faker==6.1.1 + # via -r requirements/_test.in +h11==0.9.0 + # via + # -c requirements/_base.txt + # httpcore +hiredis==1.1.0 + # via aioredis +httpcore==0.10.2 + # via + # -c requirements/_base.txt + # httpx +httpx==0.14.3 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # respx +icdiff==1.9.1 + # via pytest-icdiff +idna-ssl==1.1.0 + # via + # -c requirements/_base.txt + # aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # idna-ssl + # requests + # rfc3986 + # yarl +immutables==0.14 + # via + # -c requirements/_base.txt + # contextvars +importlib-metadata==2.0.0 + # via + # -c requirements/_base.txt + # jsonschema + # kombu + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +jsonschema==3.2.0 + # via docker-compose +kombu==5.0.2 + # via + # -c requirements/_base.txt + # celery +lazy-object-proxy==1.4.3 + # via astroid +mako==1.1.4 + # via alembic +markupsafe==1.1.1 + # via + # -c requirements/_base.txt + # mako +mccabe==0.6.1 + # via pylint +multidict==5.0.0 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +packaging==20.9 + # via pytest +pamqp==2.3.0 + # via aiormq +paramiko==2.7.2 + # via docker +pluggy==0.13.1 + # via pytest +pprintpp==0.4.0 + # via pytest-icdiff +prompt-toolkit==3.0.8 + # via + # -c requirements/_base.txt + # click-repl +psycopg2-binary==2.8.6 + # via + # -c requirements/_base.txt + # sqlalchemy +ptvsd==4.3.2 + # via -r requirements/_test.in +py==1.10.0 + # via + # pytest + # pytest-forked +pycparser==2.20 + # via cffi +pylint==2.6.0 + # via -r requirements/_test.in +pynacl==1.4.0 + # via paramiko +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via jsonschema +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-celery==0.0.0a1 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-docker==0.10.1 + # via -r requirements/_test.in +pytest-forked==1.3.0 + # via pytest-xdist +pytest-icdiff==0.5 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest-xdist==2.2.1 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-docker + # pytest-forked + # pytest-icdiff + # pytest-mock + # pytest-xdist +python-dateutil==2.8.1 + # via + # alembic + # faker +python-dotenv==0.15.0 + # via + # -c requirements/_base.txt + # docker-compose +python-editor==1.0.4 + # via alembic +pytz==2020.4 + # via + # -c requirements/_base.txt + # celery +pyyaml==5.3.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # docker-compose +redis==3.5.3 + # via + # -c requirements/_base.txt + # celery +requests==2.24.0 + # via + # -c requirements/_base.txt + # codecov + # coveralls + # docker + # docker-compose +respx==0.12.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_test.in +rfc3986[idna2008]==1.4.0 + # via + # -c requirements/_base.txt + # httpx +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid + # bcrypt + # click-repl + # docker + # dockerpty + # jsonschema + # pynacl + # python-dateutil + # websocket-client +sniffio==1.2.0 + # via + # -c requirements/_base.txt + # httpcore + # httpx +sqlalchemy[postgresql_psycopg2binary]==1.3.20 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # alembic +text-unidecode==1.3 + # via faker +texttable==1.6.3 + # via docker-compose +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +urllib3==1.25.11 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # requests +vine==5.0.0 + # via + # -c requirements/_base.txt + # amqp + # celery +wcwidth==0.2.5 + # via + # -c requirements/_base.txt + # prompt-toolkit +websocket-client==0.57.0 + # via + # docker + # docker-compose +wrapt==1.12.1 + # via astroid +yarl==1.6.2 + # via + # -c requirements/_base.txt + # aio-pika + # aiohttp + # aiormq +zipp==3.4.0 + # via + # -c requirements/_base.txt + # importlib-metadata # 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 26a5991fc2c..3cb19886728 100644 --- a/services/director-v2/requirements/_tools.txt +++ b/services/director-v2/requirements/_tools.txt @@ -4,33 +4,96 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -argh==0.26.2 # via watchdog -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via -c requirements/_base.txt, -c requirements/_test.txt, black, pip-tools -dataclasses==0.7 ; python_version < "3.7" # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==2.0.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, watchdog -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -watchdog[watchmedo]==1.0.0 # via -r requirements/_tools.in -zipp==3.4.0 # via -c requirements/_base.txt, -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +argh==0.26.2 + # via watchdog +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # pip-tools +dataclasses==0.7 ; python_version < "3.7" + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==2.0.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.3.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # watchdog +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black +virtualenv==20.4.2 + # via pre-commit +watchdog[watchmedo]==2.0.0 + # via -r requirements/_tools.in +zipp==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/services/director-v2/requirements/dev.txt b/services/director-v2/requirements/dev.txt index d6b6acc0742..86d15db9391 100644 --- a/services/director-v2/requirements/dev.txt +++ b/services/director-v2/requirements/dev.txt @@ -13,7 +13,7 @@ # installs this repo's packages -e ../../packages/models-library --e ../../packages/postgres-database/[migration] +-e ../../packages/postgres-database/ -e ../../packages/pytest-simcore/ # installs current package diff --git a/services/director/Dockerfile b/services/director/Dockerfile index 13e50e46190..9c405d3bf8a 100644 --- a/services/director/Dockerfile +++ b/services/director/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/director/requirements/_base.txt b/services/director/requirements/_base.txt index 39b812a6ef5..097d958d9ea 100644 --- a/services/director/requirements/_base.txt +++ b/services/director/requirements/_base.txt @@ -4,39 +4,156 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aiodebug==1.1.2 # via -r requirements/_base.in, simcore-service-library -aiodocker==0.14.0 # via -r requirements/_base.in -git+https://github.com/ITISFoundation/aiohttp_apiset.git@5c8a61ceb6de7ed9e09db5b4609b458a0d3773df # via -r requirements/_base.in -aiohttp==3.3.2 # via -r requirements/_base.in, aiodocker, aiohttp-apiset, aiozipkin, simcore-service-library -aiopg==1.0.0 # via -r requirements/_base.in, simcore-service-library -aiozipkin==0.7.1 # via -r requirements/_base.in, simcore-service-library -async-generator==1.10 # via -r requirements/_base.in, asyncio-extras -async-timeout==3.0.1 # via -r requirements/_base.in, aiohttp -asyncio-extras==1.3.2 # via -r requirements/_base.in -attrs==20.2.0 # via -r requirements/_base.in, aiohttp, openapi-core, simcore-service-library -certifi==2019.3.9 # via -r requirements/_base.in, requests -chardet==3.0.4 # via -r requirements/_base.in, aiohttp, requests -dataclasses==0.7 # via -r requirements/_base.in, pydantic -idna-ssl==1.1.0 # via -r requirements/_base.in, aiohttp -idna==2.8 # via -r requirements/_base.in, idna-ssl, requests, yarl -isodate==0.6.0 # via -r requirements/_base.in, openapi-core -jsonschema==2.6.0 # via -r requirements/_base.in, aiohttp-apiset, openapi-spec-validator, simcore-service-library -lazy-object-proxy==1.4.3 # via -r requirements/_base.in, openapi-core, simcore-service-library -multidict==4.5.2 # via -r requirements/_base.in, aiohttp, yarl -openapi-core==0.12.0 # via -r requirements/_base.in, simcore-service-library -openapi-spec-validator==0.2.9 # via -r requirements/_base.in, openapi-core -prometheus-client==0.8.0 # via -r requirements/_base.in, simcore-service-library -psycopg2-binary==2.8.6 # via -r requirements/_base.in, aiopg, simcore-service-library -pydantic==1.7.2 # via -r requirements/_base.in, simcore-service-library -pyyaml==5.3 # via -r requirements/_base.in, aiohttp-apiset, openapi-spec-validator, simcore-service-library -requests==2.22.0 # via -r requirements/_base.in -git+https://github.com/ITISFoundation/osparc-simcore.git@c8669fb52659b684514fefa4f3b4599f57f276a0#egg=simcore-service-library&subdirectory=packages/service-library # via -r requirements/_base.in -six==1.12.0 # via -r requirements/_base.in, isodate, openapi-core, openapi-spec-validator, tenacity -sqlalchemy==1.3.20 # via -r requirements/_base.in, simcore-service-library -strict-rfc3339==0.7 # via -r requirements/_base.in, openapi-core -tenacity==6.0.0 # via -r requirements/_base.in, simcore-service-library -trafaret==2.1.0 # via -r requirements/_base.in, simcore-service-library -ujson==4.0.1 # via -r requirements/_base.in, simcore-service-library -urllib3==1.25.11 # via -r requirements/_base.in, requests -werkzeug==1.0.1 # via -r requirements/_base.in, simcore-service-library -yarl==1.3.0 # via -r requirements/_base.in, aiodocker, aiohttp +aiodebug==1.1.2 + # via + # -r requirements/_base.in + # simcore-service-library +aiodocker==0.14.0 + # via -r requirements/_base.in +git+https://github.com/ITISFoundation/aiohttp_apiset.git@5c8a61ceb6de7ed9e09db5b4609b458a0d3773df + # via -r requirements/_base.in +aiohttp==3.3.2 + # via + # -r requirements/_base.in + # aiodocker + # aiohttp-apiset + # aiozipkin + # simcore-service-library +aiopg==1.0.0 + # via + # -r requirements/_base.in + # simcore-service-library +aiozipkin==0.7.1 + # via + # -r requirements/_base.in + # simcore-service-library +async-generator==1.10 + # via + # -r requirements/_base.in + # asyncio-extras +async-timeout==3.0.1 + # via + # -r requirements/_base.in + # aiohttp +asyncio-extras==1.3.2 + # via -r requirements/_base.in +attrs==20.2.0 + # via + # -r requirements/_base.in + # aiohttp + # openapi-core + # simcore-service-library +certifi==2019.3.9 + # via + # -r requirements/_base.in + # requests +chardet==3.0.4 + # via + # -r requirements/_base.in + # aiohttp + # requests +dataclasses==0.7 + # via + # -r requirements/_base.in + # pydantic +idna-ssl==1.1.0 + # via + # -r requirements/_base.in + # aiohttp +idna==2.8 + # via + # -r requirements/_base.in + # idna-ssl + # requests + # yarl +isodate==0.6.0 + # via + # -r requirements/_base.in + # openapi-core +jsonschema==2.6.0 + # via + # -r requirements/_base.in + # aiohttp-apiset + # openapi-spec-validator + # simcore-service-library +lazy-object-proxy==1.4.3 + # via + # -r requirements/_base.in + # openapi-core + # simcore-service-library +multidict==4.5.2 + # via + # -r requirements/_base.in + # aiohttp + # yarl +openapi-core==0.12.0 + # via + # -r requirements/_base.in + # simcore-service-library +openapi-spec-validator==0.2.9 + # via + # -r requirements/_base.in + # openapi-core +prometheus-client==0.8.0 + # via + # -r requirements/_base.in + # simcore-service-library +psycopg2-binary==2.8.6 + # via + # -r requirements/_base.in + # aiopg + # simcore-service-library +pydantic==1.7.2 + # via + # -r requirements/_base.in + # simcore-service-library +pyyaml==5.3 + # via + # -r requirements/_base.in + # aiohttp-apiset + # openapi-spec-validator + # simcore-service-library +requests==2.22.0 + # via -r requirements/_base.in +git+https://github.com/ITISFoundation/osparc-simcore.git@c8669fb52659b684514fefa4f3b4599f57f276a0#egg=simcore-service-library&subdirectory=packages/service-library + # via -r requirements/_base.in +six==1.12.0 + # via + # -r requirements/_base.in + # isodate + # openapi-core + # openapi-spec-validator + # tenacity +sqlalchemy==1.3.20 + # via + # -r requirements/_base.in + # simcore-service-library +strict-rfc3339==0.7 + # via + # -r requirements/_base.in + # openapi-core +tenacity==6.0.0 + # via + # -r requirements/_base.in + # simcore-service-library +trafaret==2.1.0 + # via + # -r requirements/_base.in + # simcore-service-library +ujson==4.0.1 + # via + # -r requirements/_base.in + # simcore-service-library +urllib3==1.25.11 + # via + # -r requirements/_base.in + # requests +werkzeug==1.0.1 + # via + # -r requirements/_base.in + # simcore-service-library +yarl==1.3.0 + # via + # -r requirements/_base.in + # aiodocker + # aiohttp diff --git a/services/director/requirements/ci.txt b/services/director/requirements/ci.txt index 21825b5a618..87da42f06e8 100644 --- a/services/director/requirements/ci.txt +++ b/services/director/requirements/ci.txt @@ -9,7 +9,6 @@ # installs base + tests requirements -r _test.txt ../../packages/pytest-simcore/ -../../packages/models-library/ # installs current package . diff --git a/services/director/requirements/dev.txt b/services/director/requirements/dev.txt index 8b829015e57..07b54941298 100644 --- a/services/director/requirements/dev.txt +++ b/services/director/requirements/dev.txt @@ -12,7 +12,6 @@ # installs this repo's packages -e ../../packages/pytest-simcore/ --e ../../packages/models-library/ # installs current package -e . diff --git a/services/director/requirements/prod.txt b/services/director/requirements/prod.txt index 1a898bc94f0..99d6b7a93bd 100644 --- a/services/director/requirements/prod.txt +++ b/services/director/requirements/prod.txt @@ -9,9 +9,5 @@ # installs base requirements -r _base.txt -# installs this repo's packages -../../packages/service-library/ -../../packages/models-library/ - # installs current package . diff --git a/services/director/setup.py b/services/director/setup.py index 6855c8af42b..73d165eda90 100644 --- a/services/director/setup.py +++ b/services/director/setup.py @@ -25,7 +25,6 @@ def read_reqs(reqs_path: Path): install_requirements = read_reqs(here / "requirements" / "_base.txt") + [ "aiohttp-apiset", "simcore-service-library", - "simcore-models-library", ] test_requirements = read_reqs(here / "requirements" / "_test.txt") diff --git a/services/director/src/simcore_service_director/producer.py b/services/director/src/simcore_service_director/producer.py index 0b3f5102e16..6f4d4e490b7 100644 --- a/services/director/src/simcore_service_director/producer.py +++ b/services/director/src/simcore_service_director/producer.py @@ -12,12 +12,12 @@ import aiodocker import tenacity from aiohttp import ClientConnectionError, ClientSession, web -from models_library.settings.services_common import ServicesCommonSettings from servicelib.async_utils import run_sequentially_in_context from servicelib.monitor_services import service_started, service_stopped from . import config, docker_utils, exceptions, registry_proxy from .config import APP_CLIENT_SESSION_KEY +from .services_common import ServicesCommonSettings from .system_utils import get_system_extra_hosts_raw log = logging.getLogger(__name__) diff --git a/services/director/src/simcore_service_director/services_common.py b/services/director/src/simcore_service_director/services_common.py new file mode 100644 index 00000000000..f1aef5ac668 --- /dev/null +++ b/services/director/src/simcore_service_director/services_common.py @@ -0,0 +1,40 @@ +# +# Taken from packages/models-library/src/models_library/settings/services_common.py +# since this service is frozen and MUST NOT ADD ANY MORE DEPENDENCIES +# +# +from pydantic import BaseSettings, Field, PositiveInt + +_BASE_TIMEOUT_FOR_STOPPING_SERVICES = 60 * 60 + + +class ServicesCommonSettings(BaseSettings): + # set this interval to 1 hour + director_dynamic_service_save_timeout: PositiveInt = Field( + _BASE_TIMEOUT_FOR_STOPPING_SERVICES, + description=( + "When stopping a dynamic service, if it has " + "big payloads it is important to have longer timeouts." + ), + ) + webserver_director_stop_service_timeout: PositiveInt = Field( + _BASE_TIMEOUT_FOR_STOPPING_SERVICES + 10, + description=( + "When the webserver invokes the director API to stop " + "a service which has a very long timeout, it also " + "requires to wait that amount plus some extra padding." + ), + ) + storage_service_upload_download_timeout: PositiveInt = Field( + 60 * 60, + description=( + "When dynamic services upload and download data from storage, " + "sometimes very big payloads are involved. In order to handle " + "such payloads it is required to have long timeouts which " + "allow the service to finish the operation." + ), + ) + + class Config: + env_prefix = "SERVICES_COMMON_" + case_sensitive = False diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile index 8f87461f137..2bd31f85d67 100644 --- a/services/migration/Dockerfile +++ b/services/migration/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/sidecar/Dockerfile b/services/sidecar/Dockerfile index ac7daca7b71..4b7460748d8 100644 --- a/services/sidecar/Dockerfile +++ b/services/sidecar/Dockerfile @@ -68,7 +68,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/sidecar/requirements/_base.in b/services/sidecar/requirements/_base.in index c7156f88935..fab6e675f5f 100644 --- a/services/sidecar/requirements/_base.in +++ b/services/sidecar/requirements/_base.in @@ -9,24 +9,23 @@ # - Added as constraints instead of requirements in order to avoid polluting base.txt # - Will be installed when prod.txt or dev.txt # +-c ../../../packages/models-library/requirements/_base.in -c ../../../packages/postgres-database/requirements/_base.in -c ../../../packages/s3wrapper/requirements/_base.in -c ../../../packages/service-library/requirements/_base.in --c ../../../packages/models-library/requirements/_base.in -# -urllib3 -aiofile aio-pika aiodocker +aiofile aiofiles aiopg -click -sqlalchemy[postgresql_psycopg2binary] +aioredlock celery[redis] +click networkx packaging pydantic +sqlalchemy[postgresql_psycopg2binary] tenacity -aioredlock +urllib3 diff --git a/services/sidecar/requirements/_base.txt b/services/sidecar/requirements/_base.txt index bcda9d18b48..d032473cfd8 100644 --- a/services/sidecar/requirements/_base.txt +++ b/services/sidecar/requirements/_base.txt @@ -4,46 +4,143 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aio-pika==6.7.1 # via -r requirements/_base.in -aiodocker==0.19.1 # via -r requirements/_base.in -aiofile==3.1.0 # via -r requirements/_base.in -aiofiles==0.5.0 # via -r requirements/_base.in -aiohttp==3.7.3 # via -c requirements/../../../packages/service-library/requirements/_base.in, aiodocker -aiopg[sa]==1.0.0 # via -c requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -aioredis==1.3.1 # via aioredlock -aioredlock==0.5.2 # via -r requirements/_base.in -aiormq==3.2.3 # via aio-pika -amqp==2.6.1 # via kombu -async-timeout==3.0.1 # via aiohttp, aioredis -attrs==20.2.0 # via -c requirements/../../../packages/service-library/requirements/_base.in, aiohttp, aioredlock -billiard==3.6.3.0 # via celery -caio==0.6.1 # via aiofile -celery[redis]==4.4.7 # via -r requirements/_base.in -chardet==3.0.4 # via aiohttp -click==7.1.2 # via -r requirements/_base.in -dataclasses==0.7 # via pydantic -decorator==4.4.2 # via networkx -dnspython==2.0.0 # via email-validator -email-validator==1.1.1 # via pydantic -hiredis==1.1.0 # via aioredis -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via email-validator, idna-ssl, yarl -importlib-metadata==2.0.0 # via kombu -kombu==4.6.11 # via celery -multidict==4.7.6 # via aiohttp, yarl -networkx==2.5 # via -r requirements/_base.in -packaging==20.4 # via -r requirements/_base.in -pamqp==2.3.0 # via aiormq -psycopg2-binary==2.8.6 # via -c requirements/../../../packages/service-library/requirements/_base.in, aiopg, sqlalchemy -pydantic[email]==1.7.2 # via -c requirements/../../../packages/models-library/requirements/_base.in, -c requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -pyparsing==2.4.7 # via packaging -pytz==2020.1 # via celery -redis==3.5.3 # via celery -six==1.15.0 # via packaging, tenacity -sqlalchemy[postgresql_psycopg2binary]==1.3.19 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/_base.in, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/_base.in, -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in, aiopg -tenacity==6.2.0 # via -c requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -typing-extensions==3.7.4.3 # via aiodocker, aiohttp, yarl -urllib3==1.25.11 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/_base.in, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/_base.in -vine==1.3.0 # via amqp, celery -yarl==1.5.1 # via -c requirements/../../../packages/postgres-database/requirements/_base.in, aio-pika, aiohttp, aiormq -zipp==3.2.0 # via importlib-metadata +aio-pika==6.7.1 + # via -r requirements/_base.in +aiodocker==0.19.1 + # via -r requirements/_base.in +aiofile==3.1.0 + # via -r requirements/_base.in +aiofiles==0.5.0 + # via -r requirements/_base.in +aiohttp==3.7.3 + # via + # -c requirements/../../../packages/service-library/requirements/_base.in + # aiodocker +aiopg[sa]==1.0.0 + # via + # -c requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +aioredis==1.3.1 + # via aioredlock +aioredlock==0.5.2 + # via -r requirements/_base.in +aiormq==3.2.3 + # via aio-pika +amqp==2.6.1 + # via kombu +async-timeout==3.0.1 + # via + # aiohttp + # aioredis +attrs==20.2.0 + # via + # -c requirements/../../../packages/service-library/requirements/_base.in + # aiohttp + # aioredlock +billiard==3.6.3.0 + # via celery +caio==0.6.1 + # via aiofile +celery[redis]==4.4.7 + # via -r requirements/_base.in +chardet==3.0.4 + # via aiohttp +click==7.1.2 + # via -r requirements/_base.in +dataclasses==0.7 + # via pydantic +decorator==4.4.2 + # via networkx +dnspython==2.0.0 + # via email-validator +email-validator==1.1.1 + # via pydantic +hiredis==1.1.0 + # via aioredis +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # email-validator + # idna-ssl + # yarl +importlib-metadata==2.0.0 + # via kombu +kombu==4.6.11 + # via celery +multidict==4.7.6 + # via + # aiohttp + # yarl +networkx==2.5 + # via -r requirements/_base.in +packaging==20.4 + # via -r requirements/_base.in +pamqp==2.3.0 + # via aiormq +psycopg2-binary==2.8.6 + # via + # -c requirements/../../../packages/service-library/requirements/_base.in + # aiopg + # sqlalchemy +pydantic[email]==1.7.2 + # via + # -c requirements/../../../packages/models-library/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +pyparsing==2.4.7 + # via packaging +pytz==2020.1 + # via celery +redis==3.5.3 + # via celery +six==1.15.0 + # via + # packaging + # tenacity +sqlalchemy[postgresql_psycopg2binary]==1.3.19 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/_base.in + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/_base.in + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in + # aiopg +tenacity==6.2.0 + # via + # -c requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +typing-extensions==3.7.4.3 + # via + # aiodocker + # aiohttp + # yarl +urllib3==1.25.11 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/_base.in +vine==1.3.0 + # via + # amqp + # celery +yarl==1.5.1 + # via + # -c requirements/../../../packages/postgres-database/requirements/_base.in + # aio-pika + # aiohttp + # aiormq +zipp==3.2.0 + # via importlib-metadata diff --git a/services/sidecar/requirements/_packages.in b/services/sidecar/requirements/_packages.in index 50501217edb..266b3e9c285 100644 --- a/services/sidecar/requirements/_packages.in +++ b/services/sidecar/requirements/_packages.in @@ -4,7 +4,7 @@ -c ../../../requirements/constraints.txt -c _base.txt +-r ../../../packages/models-library/requirements/_base.in -r ../../../packages/postgres-database/requirements/_base.in -r ../../../packages/s3wrapper/requirements/_base.in -r ../../../packages/service-library/requirements/_base.in --r ../../../packages/models-library/requirements/_base.in diff --git a/services/sidecar/requirements/_packages.txt b/services/sidecar/requirements/_packages.txt index 0fab0c51a2f..1857f06187d 100644 --- a/services/sidecar/requirements/_packages.txt +++ b/services/sidecar/requirements/_packages.txt @@ -4,46 +4,188 @@ # # pip-compile --output-file=requirements/_packages.txt requirements/_packages.in # -aiodebug==1.1.2 # via -r requirements/../../../packages/service-library/requirements/_base.in -aiohttp==3.7.3 # via -c requirements/_base.txt, -r requirements/../../../packages/service-library/requirements/_base.in, aiozipkin -aiopg[sa]==1.0.0 # via -c requirements/_base.txt, -r 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/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in -async-timeout==3.0.1 # via -c requirements/_base.txt, aiohttp -attrs==20.2.0 # via -c requirements/_base.txt, -r requirements/../../../packages/service-library/requirements/_base.in, aiohttp, jsonschema, openapi-core -certifi==2020.6.20 # via minio -chardet==3.0.4 # via -c requirements/_base.txt, aiohttp -configparser==5.0.0 # via minio -dataclasses==0.7 # via -c requirements/_base.txt, pydantic -dnspython==2.0.0 # via -c requirements/_base.txt, email-validator -email-validator==1.1.1 # via -c requirements/_base.txt, pydantic -idna-ssl==1.1.0 # via -c requirements/_base.txt, aiohttp -idna==2.10 # via -c requirements/_base.txt, email-validator, idna-ssl, yarl -importlib-metadata==2.0.0 # via -c requirements/_base.txt, jsonschema -isodate==0.6.0 # via openapi-core -jsonschema==3.2.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator -lazy-object-proxy==1.4.3 # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-core -minio==6.0.0 # via -r requirements/../../../packages/s3wrapper/requirements/_base.in -multidict==4.7.6 # via -c requirements/_base.txt, aiohttp, yarl -openapi-core==0.12.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -openapi-spec-validator==0.2.9 # via openapi-core -prometheus-client==0.8.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -psycopg2-binary==2.8.6 # via -c requirements/_base.txt, -r requirements/../../../packages/service-library/requirements/_base.in, aiopg, sqlalchemy -pydantic==1.7.2 # via -c requirements/_base.txt, -r requirements/../../../packages/models-library/requirements/_base.in, -r requirements/../../../packages/service-library/requirements/_base.in -pyrsistent==0.17.3 # via jsonschema -python-dateutil==2.8.1 # via minio -pytz==2020.1 # via -c requirements/_base.txt, minio -pyyaml==5.3.1 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator -six==1.15.0 # via -c requirements/_base.txt, isodate, jsonschema, openapi-core, openapi-spec-validator, python-dateutil, tenacity -sqlalchemy[postgresql_psycopg2binary]==1.3.19 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -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, aiopg -strict-rfc3339==0.7 # via openapi-core -tenacity==6.2.0 # via -c requirements/_base.txt, -r requirements/../../../packages/service-library/requirements/_base.in -trafaret==2.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, aiohttp, yarl -ujson==3.2.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -urllib3==1.25.11 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, -r requirements/../../../packages/s3wrapper/requirements/_base.in, minio -werkzeug==1.0.1 # via -r requirements/../../../packages/service-library/requirements/_base.in -yarl==1.5.1 # via -c requirements/_base.txt, -r requirements/../../../packages/postgres-database/requirements/_base.in, aiohttp -zipp==3.2.0 # via -c requirements/_base.txt, importlib-metadata +aiodebug==1.1.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in +aiohttp==3.7.3 + # via + # -c requirements/_base.txt + # -r requirements/../../../packages/service-library/requirements/_base.in + # aiozipkin +aiopg[sa]==1.0.0 + # via + # -c requirements/_base.txt + # -r 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/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/service-library/requirements/_base.in +async-timeout==3.0.1 + # via + # -c requirements/_base.txt + # aiohttp +attrs==20.2.0 + # via + # -c requirements/_base.txt + # -r requirements/../../../packages/service-library/requirements/_base.in + # aiohttp + # jsonschema + # openapi-core +certifi==2020.6.20 + # via minio +chardet==3.0.4 + # via + # -c requirements/_base.txt + # aiohttp +configparser==5.0.0 + # via minio +dataclasses==0.7 + # via + # -c requirements/_base.txt + # pydantic +dnspython==2.0.0 + # via + # -c requirements/_base.txt + # email-validator +email-validator==1.1.1 + # via + # -c requirements/_base.txt + # pydantic +idna-ssl==1.1.0 + # via + # -c requirements/_base.txt + # aiohttp +idna==2.10 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # email-validator + # idna-ssl + # yarl +importlib-metadata==2.0.0 + # via + # -c requirements/_base.txt + # jsonschema +isodate==0.6.0 + # via openapi-core +jsonschema==3.2.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-spec-validator +lazy-object-proxy==1.4.3 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-core +minio==6.0.0 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/s3wrapper/requirements/_base.in +multidict==4.7.6 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +openapi-core==0.12.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +openapi-spec-validator==0.2.9 + # via openapi-core +prometheus-client==0.8.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +psycopg2-binary==2.8.6 + # via + # -c requirements/_base.txt + # -r requirements/../../../packages/service-library/requirements/_base.in + # aiopg + # sqlalchemy +pydantic[email]==1.7.2 + # via + # -c requirements/_base.txt + # -r requirements/../../../packages/models-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in +pyrsistent==0.17.3 + # via jsonschema +python-dateutil==2.8.1 + # via minio +pytz==2020.1 + # via + # -c requirements/_base.txt + # minio +pyyaml==5.3.1 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-spec-validator +six==1.15.0 + # via + # -c requirements/_base.txt + # isodate + # jsonschema + # openapi-core + # openapi-spec-validator + # python-dateutil + # tenacity +sqlalchemy[postgresql_psycopg2binary]==1.3.19 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -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 + # aiopg +strict-rfc3339==0.7 + # via openapi-core +tenacity==6.2.0 + # via + # -c requirements/_base.txt + # -r requirements/../../../packages/service-library/requirements/_base.in +trafaret==2.1.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +ujson==3.2.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +urllib3==1.25.11 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -r requirements/../../../packages/s3wrapper/requirements/_base.in + # minio +werkzeug==1.0.1 + # via -r requirements/../../../packages/service-library/requirements/_base.in +yarl==1.5.1 + # via + # -c requirements/_base.txt + # -r requirements/../../../packages/postgres-database/requirements/_base.in + # aiohttp +zipp==3.2.0 + # via + # -c requirements/_base.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/sidecar/requirements/_test.in b/services/sidecar/requirements/_test.in index 61b2731b62f..65065a30521 100644 --- a/services/sidecar/requirements/_test.in +++ b/services/sidecar/requirements/_test.in @@ -15,11 +15,11 @@ coverage pytest pytest-aiohttp # incompatible with pytest-asyncio. See https://github.com/pytest-dev/pytest-asyncio/issues/76 pytest-cov -pytest-instafail pytest-icdiff +pytest-instafail +pytest-lazy-fixture pytest-mock pytest-sugar -pytest-lazy-fixture # fixtures aiopg diff --git a/services/sidecar/requirements/_test.txt b/services/sidecar/requirements/_test.txt index 3ae777ed869..8d96106f1f3 100644 --- a/services/sidecar/requirements/_test.txt +++ b/services/sidecar/requirements/_test.txt @@ -4,57 +4,201 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.7.3 # via -c requirements/_base.txt, -c requirements/_packages.txt, pytest-aiohttp -aiopg[sa]==1.0.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, -r requirements/_test.in -alembic==1.4.3 # via -r requirements/_test.in -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiohttp -attrs==20.2.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiohttp, pytest -certifi==2020.6.20 # via -c requirements/_packages.txt, requests -chardet==3.0.4 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiohttp, requests -coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -docker==4.4.0 # via -r requirements/_test.in -docopt==0.6.2 # via coveralls -icdiff==1.9.1 # via pytest-icdiff -idna-ssl==1.1.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiohttp -idna==2.10 # via -c requirements/_base.txt, -c requirements/_packages.txt, idna-ssl, requests, yarl -importlib-metadata==2.0.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -lazy-object-proxy==1.4.3 # via -c requirements/_packages.txt, astroid -mako==1.1.3 # via alembic -markupsafe==1.1.1 # via mako -mccabe==0.6.1 # via pylint -multidict==4.7.6 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiohttp, yarl -packaging==20.4 # via -c requirements/_base.txt, pytest, pytest-sugar -pluggy==0.13.1 # via pytest -pprintpp==0.4.0 # via pytest-icdiff -psycopg2-binary==2.8.6 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiopg, sqlalchemy -ptvsd==4.3.2 # via -r requirements/_test.in -py==1.9.0 # via pytest -pylint==2.6.0 # via -r requirements/_test.in -pyparsing==2.4.7 # via -c requirements/_base.txt, packaging -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-icdiff==0.5 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-lazy-fixture==0.6.3 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-sugar==0.9.4 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-icdiff, pytest-instafail, pytest-lazy-fixture, pytest-mock, pytest-sugar -python-dateutil==2.8.1 # via -c requirements/_packages.txt, alembic -python-dotenv==0.15.0 # via -r requirements/_test.in -python-editor==1.0.4 # via alembic -requests==2.25.0 # via coveralls, docker -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, astroid, docker, packaging, python-dateutil, websocket-client -sqlalchemy[postgresql_psycopg2binary]==1.3.19 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, -c requirements/_packages.txt, aiopg, alembic -termcolor==1.1.0 # via pytest-sugar -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiohttp, yarl -urllib3==1.25.11 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, -c requirements/_packages.txt, requests -websocket-client==0.57.0 # via docker -wrapt==1.12.1 # via astroid -yarl==1.5.1 # via -c requirements/_base.txt, -c requirements/_packages.txt, aiohttp -zipp==3.2.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, importlib-metadata +aiohttp==3.7.3 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # pytest-aiohttp +aiopg==1.0.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -r requirements/_test.in +alembic==1.5.4 + # via -r requirements/_test.in +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiohttp +attrs==20.2.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiohttp + # pytest +certifi==2020.6.20 + # via + # -c requirements/_packages.txt + # requests +chardet==3.0.4 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiohttp + # requests +coverage==5.4 + # via + # -r requirements/_test.in + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +docker==4.4.1 + # via -r requirements/_test.in +docopt==0.6.2 + # via coveralls +icdiff==1.9.1 + # via pytest-icdiff +idna-ssl==1.1.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_packages.txt + # idna-ssl + # requests + # yarl +importlib-metadata==2.0.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +lazy-object-proxy==1.4.3 + # via + # -c requirements/_packages.txt + # astroid +mako==1.1.4 + # via alembic +markupsafe==1.1.1 + # via mako +mccabe==0.6.1 + # via pylint +multidict==4.7.6 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiohttp + # yarl +packaging==20.4 + # via + # -c requirements/_base.txt + # pytest + # pytest-sugar +pluggy==0.13.1 + # via pytest +pprintpp==0.4.0 + # via pytest-icdiff +psycopg2-binary==2.8.6 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiopg + # sqlalchemy +ptvsd==4.3.2 + # via -r requirements/_test.in +py==1.10.0 + # via pytest +pylint==2.6.0 + # via -r requirements/_test.in +pyparsing==2.4.7 + # via + # -c requirements/_base.txt + # packaging +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-icdiff==0.5 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-lazy-fixture==0.6.3 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-sugar==0.9.4 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-icdiff + # pytest-instafail + # pytest-lazy-fixture + # pytest-mock + # pytest-sugar +python-dateutil==2.8.1 + # via + # -c requirements/_packages.txt + # alembic +python-dotenv==0.15.0 + # via -r requirements/_test.in +python-editor==1.0.4 + # via alembic +requests==2.25.1 + # via + # coveralls + # docker +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # astroid + # docker + # packaging + # python-dateutil + # websocket-client +sqlalchemy[postgresql_psycopg2binary]==1.3.19 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiopg + # alembic +termcolor==1.1.0 + # via pytest-sugar +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiohttp + # yarl +urllib3==1.25.11 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_packages.txt + # requests +websocket-client==0.57.0 + # via docker +wrapt==1.12.1 + # via astroid +yarl==1.5.1 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # aiohttp +zipp==3.2.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # importlib-metadata diff --git a/services/sidecar/requirements/_tools.txt b/services/sidecar/requirements/_tools.txt index 4f4743fb69c..7862c085960 100644 --- a/services/sidecar/requirements/_tools.txt +++ b/services/sidecar/requirements/_tools.txt @@ -4,33 +4,99 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -argh==0.26.2 # via watchdog -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via -c requirements/_base.txt, black, pip-tools -dataclasses==0.7 # via -c requirements/_base.txt, -c requirements/_packages.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==2.0.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_packages.txt, pre-commit, watchdog -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_packages.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -watchdog[watchmedo]==1.0.0 # via -r requirements/_tools.in -zipp==3.2.0 # via -c requirements/_base.txt, -c requirements/_packages.txt, -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +argh==0.26.2 + # via watchdog +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # -c requirements/_base.txt + # black + # pip-tools +dataclasses==0.7 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==2.0.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.3.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_packages.txt + # pre-commit + # watchdog +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -c requirements/_test.txt + # black +virtualenv==20.4.2 + # via pre-commit +watchdog[watchmedo]==2.0.0 + # via -r requirements/_tools.in +zipp==3.2.0 + # via + # -c requirements/_base.txt + # -c requirements/_packages.txt + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/services/sidecar/requirements/ci.txt b/services/sidecar/requirements/ci.txt index d48f032bbac..a9272de2df8 100644 --- a/services/sidecar/requirements/ci.txt +++ b/services/sidecar/requirements/ci.txt @@ -12,13 +12,13 @@ -r _test.txt # installs this repo's packages -../../services/storage/client-sdk/python/ -../../packages/s3wrapper/ -../../packages/postgres-database/[migration] -../../packages/simcore-sdk/ -../../packages/service-library/ ../../packages/models-library/ +../../packages/postgres-database/ ../../packages/pytest-simcore/ +../../packages/s3wrapper/ +../../packages/service-library/ +../../packages/simcore-sdk/ +../../services/storage/client-sdk/python/ # installs current package . diff --git a/services/sidecar/requirements/dev.txt b/services/sidecar/requirements/dev.txt index 12ada9e5ecb..d904068128c 100644 --- a/services/sidecar/requirements/dev.txt +++ b/services/sidecar/requirements/dev.txt @@ -13,13 +13,13 @@ -r _tools.txt # installs this repo's packages --e ../../services/storage/client-sdk/python/ --e ../../packages/s3wrapper/ --e ../../packages/postgres-database/[migration] --e ../../packages/simcore-sdk/ --e ../../packages/service-library/ -e ../../packages/models-library/ +-e ../../packages/postgres-database/ -e ../../packages/pytest-simcore/ +-e ../../packages/s3wrapper/ +-e ../../packages/service-library/ +-e ../../packages/simcore-sdk/ +-e ../../services/storage/client-sdk/python/ # installs current package -e . diff --git a/services/sidecar/requirements/prod.txt b/services/sidecar/requirements/prod.txt index 708a6a25ef0..a239271cfbf 100644 --- a/services/sidecar/requirements/prod.txt +++ b/services/sidecar/requirements/prod.txt @@ -11,12 +11,12 @@ -r _packages.txt # installs this repo's packages -../../services/storage/client-sdk/python/ -../../packages/s3wrapper/ +../../packages/models-library/ ../../packages/postgres-database/ -../../packages/simcore-sdk/ +../../packages/s3wrapper/ ../../packages/service-library/ -../../packages/models-library/ +../../packages/simcore-sdk/ +../../services/storage/client-sdk/python/ # installs current package . diff --git a/services/sidecar/setup.py b/services/sidecar/setup.py index 3a1345da3b5..4bdab22da30 100644 --- a/services/sidecar/setup.py +++ b/services/sidecar/setup.py @@ -31,7 +31,7 @@ def read_reqs(reqs_path: Path): ] test_requirements = read_reqs(current_dir / "requirements" / "_test.txt") + [ - "simcore-postgres-database[migration]" + "simcore-postgres-database" ] diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile index 93c8a3fc736..05b224fb475 100644 --- a/services/storage/Dockerfile +++ b/services/storage/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index a85b9707ea0..96001f24b83 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -4,69 +4,239 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aiobotocore==1.0.7 # via -r requirements/_base.in -aiodebug==1.1.2 # via -r requirements/../../../packages/service-library/requirements/_base.in -aiofiles==0.6.0 # via -r requirements/_base.in -aiohttp-swagger[performance]==1.0.15 # via -r requirements/_base.in -aiohttp==3.7.3 # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiobotocore, aiohttp-swagger, aiozipkin -aioitertools==0.7.0 # via aiobotocore -aiopg[sa]==1.0.0 # via -r requirements/../../../packages/service-library/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/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in -async-timeout==3.0.1 # via aiohttp -attrs==20.2.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, aiohttp, jsonschema, openapi-core -blackfynn==4.0.0 # via -r requirements/_base.in -boto3==1.12.32 # via -c requirements/./constraints.txt, blackfynn -botocore==1.15.32 # via aiobotocore, boto3, s3transfer -certifi==2020.6.20 # via minio, requests -chardet==3.0.4 # via aiohttp, requests -click==7.1.2 # via -r requirements/_base.in -configparser==5.0.1 # via blackfynn, minio -dataclasses==0.7 # via pydantic -deprecated==1.2.10 # via blackfynn -dnspython==2.0.0 # via email-validator -docopt==0.6.2 # via blackfynn -docutils==0.15.2 # via botocore -email-validator==1.1.1 # via pydantic -future==0.18.2 # via blackfynn -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via email-validator, idna-ssl, requests, yarl -importlib-metadata==2.0.0 # via jsonschema -isodate==0.6.0 # via openapi-core -jinja2==2.11.2 # via aiohttp-swagger -jmespath==0.10.0 # via boto3, botocore -jsonschema==3.2.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator -lazy-object-proxy==1.4.3 # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-core -markupsafe==1.1.1 # via aiohttp-swagger, jinja2 -minio==6.0.0 # via -r requirements/../../../packages/s3wrapper/requirements/_base.in -multidict==5.0.0 # via aiohttp, yarl -openapi-core==0.12.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -openapi-spec-validator==0.2.9 # via openapi-core -prometheus-client==0.8.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -protobuf==3.13.0 # via blackfynn -psutil==5.7.3 # via blackfynn -psycopg2-binary==2.8.6 # via -r requirements/../../../packages/service-library/requirements/_base.in, aiopg, sqlalchemy -pydantic[email]==1.7.2 # via -r requirements/../../../packages/models-library/requirements/_base.in, -r requirements/../../../packages/service-library/requirements/_base.in -pyrsistent==0.17.3 # via jsonschema -python-dateutil==2.8.1 # via blackfynn, botocore, minio -pytz==2020.1 # via blackfynn, minio -pyyaml==5.3.1 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in, aiohttp-swagger, openapi-spec-validator -requests==2.24.0 # via blackfynn -s3transfer==0.3.3 # via boto3 -semantic-version==2.8.5 # via -r requirements/_base.in -semver==2.13.0 # via blackfynn -six==1.15.0 # via isodate, jsonschema, openapi-core, openapi-spec-validator, protobuf, python-dateutil, tenacity, websocket-client -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/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, aiopg -strict-rfc3339==0.7 # via openapi-core -tenacity==6.2.0 # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -trafaret==2.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -typing-extensions==3.7.4.3 # via aiohttp, aioitertools, yarl -ujson==4.0.1 # via -r requirements/../../../packages/service-library/requirements/_base.in, aiohttp-swagger -urllib3==1.25.11 # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/s3wrapper/requirements/_base.in, botocore, minio, requests -websocket-client==0.57.0 # via blackfynn -werkzeug==1.0.1 # via -r requirements/../../../packages/service-library/requirements/_base.in -wrapt==1.12.1 # via aiobotocore, deprecated -yarl==1.6.2 # via -r requirements/../../../packages/postgres-database/requirements/_base.in, aiohttp -zipp==3.4.0 # via importlib-metadata +aiobotocore==1.0.7 + # via -r requirements/_base.in +aiodebug==1.1.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in +aiofiles==0.6.0 + # via -r requirements/_base.in +aiohttp-swagger[performance]==1.0.15 + # via -r requirements/_base.in +aiohttp==3.7.3 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in + # aiobotocore + # aiohttp-swagger + # aiozipkin +aioitertools==0.7.0 + # via aiobotocore +aiopg[sa]==1.0.0 + # via + # -r requirements/../../../packages/service-library/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/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/service-library/requirements/_base.in +async-timeout==3.0.1 + # via aiohttp +attrs==20.2.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # aiohttp + # jsonschema + # openapi-core +blackfynn==4.0.0 + # via -r requirements/_base.in +boto3==1.12.32 + # via + # -c requirements/./constraints.txt + # blackfynn +botocore==1.15.32 + # via + # aiobotocore + # boto3 + # s3transfer +certifi==2020.6.20 + # via + # minio + # requests +chardet==3.0.4 + # via + # aiohttp + # requests +click==7.1.2 + # via -r requirements/_base.in +configparser==5.0.1 + # via + # blackfynn + # minio +dataclasses==0.7 + # via pydantic +deprecated==1.2.10 + # via blackfynn +dnspython==2.0.0 + # via email-validator +docopt==0.6.2 + # via blackfynn +docutils==0.15.2 + # via botocore +email-validator==1.1.1 + # via pydantic +future==0.18.2 + # via blackfynn +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # email-validator + # idna-ssl + # requests + # yarl +importlib-metadata==2.0.0 + # via jsonschema +isodate==0.6.0 + # via openapi-core +jinja2==2.11.2 + # via aiohttp-swagger +jmespath==0.10.0 + # via + # boto3 + # botocore +jsonschema==3.2.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-spec-validator +lazy-object-proxy==1.4.3 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # openapi-core +markupsafe==1.1.1 + # via + # aiohttp-swagger + # jinja2 +minio==6.0.0 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/s3wrapper/requirements/_base.in +multidict==5.0.0 + # via + # aiohttp + # yarl +openapi-core==0.12.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +openapi-spec-validator==0.2.9 + # via openapi-core +prometheus-client==0.8.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +protobuf==3.13.0 + # via blackfynn +psutil==5.7.3 + # via blackfynn +psycopg2-binary==2.8.6 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # aiopg + # sqlalchemy +pydantic[email]==1.7.2 + # via + # -r requirements/../../../packages/models-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in +pyrsistent==0.17.3 + # via jsonschema +python-dateutil==2.8.1 + # via + # blackfynn + # botocore + # minio +pytz==2020.1 + # via + # blackfynn + # minio +pyyaml==5.3.1 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/service-library/requirements/_base.in + # aiohttp-swagger + # openapi-spec-validator +requests==2.24.0 + # via blackfynn +s3transfer==0.3.3 + # via boto3 +semantic-version==2.8.5 + # via -r requirements/_base.in +semver==2.13.0 + # via blackfynn +six==1.15.0 + # via + # isodate + # jsonschema + # openapi-core + # openapi-spec-validator + # protobuf + # python-dateutil + # tenacity + # websocket-client +sqlalchemy[postgresql_psycopg2binary]==1.3.20 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/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 + # aiopg +strict-rfc3339==0.7 + # via openapi-core +tenacity==6.2.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +trafaret==2.1.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in +typing-extensions==3.7.4.3 + # via + # aiohttp + # aioitertools + # yarl +ujson==4.0.1 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # aiohttp-swagger +urllib3==1.25.11 + # via + # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../requirements/constraints.txt + # -r requirements/../../../packages/s3wrapper/requirements/_base.in + # botocore + # minio + # requests +websocket-client==0.57.0 + # via blackfynn +werkzeug==1.0.1 + # via -r requirements/../../../packages/service-library/requirements/_base.in +wrapt==1.12.1 + # via + # aiobotocore + # deprecated +yarl==1.6.2 + # via + # -r requirements/../../../packages/postgres-database/requirements/_base.in + # aiohttp +zipp==3.4.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt index 4f85cd6fdb5..21379492180 100644 --- a/services/storage/requirements/_test.txt +++ b/services/storage/requirements/_test.txt @@ -4,69 +4,227 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.7.3 # via -c requirements/_base.txt, pytest-aiohttp -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via -c requirements/_base.txt, aiohttp -attrs==20.2.0 # via -c requirements/_base.txt, aiohttp, jsonschema, pytest, pytest-docker -bcrypt==3.2.0 # via paramiko -cached-property==1.5.2 # via docker-compose -certifi==2020.6.20 # via -c requirements/_base.txt, requests -cffi==1.14.4 # via bcrypt, cryptography, pynacl -chardet==3.0.4 # via -c requirements/_base.txt, aiohttp, requests -codecov==2.1.10 # via -r requirements/_test.in -coverage==5.3 # via -r requirements/_test.in, codecov, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -cryptography==3.3.1 # via paramiko -distro==1.5.0 # via docker-compose -docker-compose==1.27.4 # via pytest-docker -docker[ssh]==4.4.0 # via docker-compose -dockerpty==0.4.1 # via docker-compose -docopt==0.6.2 # via -c requirements/_base.txt, coveralls, docker-compose -idna-ssl==1.1.0 # via -c requirements/_base.txt, aiohttp -idna==2.10 # via -c requirements/_base.txt, idna-ssl, requests, yarl -importlib-metadata==2.0.0 # via -c requirements/_base.txt, jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via pylint -jsonschema==3.2.0 # via -c requirements/_base.txt, docker-compose -lazy-object-proxy==1.4.3 # via -c requirements/_base.txt, astroid -mccabe==0.6.1 # via pylint -multidict==5.0.0 # via -c requirements/_base.txt, aiohttp, yarl -numpy==1.19.4 # via pandas -packaging==20.7 # via pytest, pytest-sugar -pandas==1.1.5 # via -r requirements/_test.in -paramiko==2.7.2 # via docker -pluggy==0.13.1 # via pytest -ptvsd==4.3.2 # via -r requirements/_test.in -py==1.9.0 # via pytest -pycparser==2.20 # via cffi -pylint==2.6.0 # via -r requirements/_test.in -pynacl==1.4.0 # via paramiko -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via -c requirements/_base.txt, jsonschema -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-docker==0.10.1 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest-sugar==0.9.4 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-instafail, pytest-mock, pytest-sugar -python-dateutil==2.8.1 # via -c requirements/_base.txt, pandas -python-dotenv==0.15.0 # via docker-compose -pytz==2020.1 # via -c requirements/_base.txt, pandas -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, docker-compose -requests==2.24.0 # via -c requirements/_base.txt, codecov, coveralls, docker, docker-compose -six==1.15.0 # via -c requirements/_base.txt, astroid, bcrypt, cryptography, docker, dockerpty, jsonschema, pynacl, python-dateutil, websocket-client -termcolor==1.1.0 # via pytest-sugar -texttable==1.6.3 # via docker-compose -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, aiohttp, yarl -urllib3==1.25.11 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, requests -websocket-client==0.57.0 # via -c requirements/_base.txt, docker, docker-compose -wrapt==1.12.1 # via -c requirements/_base.txt, astroid -yarl==1.6.2 # via -c requirements/_base.txt, aiohttp -zipp==3.4.0 # via -c requirements/_base.txt, importlib-metadata +aiohttp==3.7.3 + # via + # -c requirements/_base.txt + # pytest-aiohttp +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via + # -c requirements/_base.txt + # aiohttp +attrs==20.2.0 + # via + # -c requirements/_base.txt + # aiohttp + # jsonschema + # pytest + # pytest-docker +bcrypt==3.2.0 + # via paramiko +cached-property==1.5.2 + # via docker-compose +certifi==2020.6.20 + # via + # -c requirements/_base.txt + # requests +cffi==1.14.5 + # via + # bcrypt + # cryptography + # pynacl +chardet==3.0.4 + # via + # -c requirements/_base.txt + # aiohttp + # requests +codecov==2.1.11 + # via -r requirements/_test.in +coverage==5.4 + # via + # -r requirements/_test.in + # codecov + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +cryptography==3.4.5 + # via + # -c requirements/../../../requirements/constraints.txt + # paramiko +distro==1.5.0 + # via docker-compose +docker-compose==1.27.4 + # via + # -c requirements/../../../requirements/constraints.txt + # pytest-docker +docker[ssh]==4.4.1 + # via docker-compose +dockerpty==0.4.1 + # via docker-compose +docopt==0.6.2 + # via + # -c requirements/_base.txt + # coveralls + # docker-compose +idna-ssl==1.1.0 + # via + # -c requirements/_base.txt + # aiohttp +idna==2.10 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # idna-ssl + # requests + # yarl +importlib-metadata==2.0.0 + # via + # -c requirements/_base.txt + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via pylint +jsonschema==3.2.0 + # via + # -c requirements/_base.txt + # docker-compose +lazy-object-proxy==1.4.3 + # via + # -c requirements/_base.txt + # astroid +mccabe==0.6.1 + # via pylint +multidict==5.0.0 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +numpy==1.19.5 + # via pandas +packaging==20.9 + # via + # pytest + # pytest-sugar +pandas==1.1.5 + # via -r requirements/_test.in +paramiko==2.7.2 + # via docker +pluggy==0.13.1 + # via pytest +ptvsd==4.3.2 + # via -r requirements/_test.in +py==1.10.0 + # via pytest +pycparser==2.20 + # via cffi +pylint==2.6.0 + # via -r requirements/_test.in +pynacl==1.4.0 + # via paramiko +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via + # -c requirements/_base.txt + # jsonschema +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-docker==0.10.1 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest-sugar==0.9.4 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-docker + # pytest-instafail + # pytest-mock + # pytest-sugar +python-dateutil==2.8.1 + # via + # -c requirements/_base.txt + # pandas +python-dotenv==0.15.0 + # via docker-compose +pytz==2020.1 + # via + # -c requirements/_base.txt + # pandas +pyyaml==5.3.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # docker-compose +requests==2.24.0 + # via + # -c requirements/_base.txt + # codecov + # coveralls + # docker + # docker-compose +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid + # bcrypt + # docker + # dockerpty + # jsonschema + # pynacl + # python-dateutil + # websocket-client +termcolor==1.1.0 + # via pytest-sugar +texttable==1.6.3 + # via docker-compose +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +urllib3==1.25.11 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # requests +websocket-client==0.57.0 + # via + # -c requirements/_base.txt + # docker + # docker-compose +wrapt==1.12.1 + # via + # -c requirements/_base.txt + # astroid +yarl==1.6.2 + # via + # -c requirements/_base.txt + # aiohttp +zipp==3.4.0 + # via + # -c requirements/_base.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/storage/requirements/_tools.txt b/services/storage/requirements/_tools.txt index 0cfeae2bcf5..5cfc86ce14b 100644 --- a/services/storage/requirements/_tools.txt +++ b/services/storage/requirements/_tools.txt @@ -4,33 +4,95 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -argh==0.26.2 # via watchdog -black==20.8b1 # via -r requirements/../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via -c requirements/_base.txt, black, pip-tools -dataclasses==0.7 # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==2.0.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==5.6.4 # via -c requirements/_test.txt, -r requirements/../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../requirements/constraints.txt, -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, watchdog -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.3 # via -c requirements/_base.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -watchdog[watchmedo]==1.0.0 # via -r requirements/_tools.in -zipp==3.4.0 # via -c requirements/_base.txt, -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +argh==0.26.2 + # via watchdog +black==20.8b1 + # via -r requirements/../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # -c requirements/_base.txt + # black + # pip-tools +dataclasses==0.7 + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==2.0.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==5.7.0 + # via + # -c requirements/_test.txt + # -r requirements/../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../requirements/devenv.txt +pyyaml==5.3.1 + # via + # -c requirements/../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # watchdog +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.3 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black +virtualenv==20.4.2 + # via pre-commit +watchdog[watchmedo]==2.0.0 + # via -r requirements/_tools.in +zipp==3.4.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 866d4aaff44..70a5d5672e0 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -82,7 +82,7 @@ RUN apt-get update \ RUN python -m venv "${VIRTUAL_ENV}" RUN pip --no-cache-dir install --upgrade \ - pip~=20.2.2 \ + pip~=21.0.1 \ wheel \ setuptools diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index 43379029aa5..ddf350e22b7 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -4,80 +4,247 @@ # # pip-compile --output-file=requirements/_base.txt requirements/_base.in # -aio-pika==6.7.1 # via -r requirements/_base.in -aiodebug==1.1.2 # via -r requirements/../../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -aiohttp-jinja2==1.2.0 # via -r requirements/_base.in -aiohttp-security==0.4.0 # via -r requirements/_base.in -aiohttp-session[secure]==2.9.0 # via -r requirements/_base.in -aiohttp-swagger[performance]==1.0.15 # via -r requirements/_base.in -aiohttp==3.6.3 # via -r requirements/../../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiohttp-jinja2, aiohttp-security, aiohttp-session, aiohttp-swagger, aiozipkin -aiopg[sa]==1.0.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -aioredis==1.3.1 # via -r requirements/_base.in, aioredlock -aioredlock==0.5.2 # via -r requirements/_base.in -aiormq==3.2.3 # via aio-pika -aiosmtplib==1.1.3 # via -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/../../../../requirements/constraints.txt, -r requirements/../../../../packages/service-library/requirements/_base.in -amqp==5.0.1 # via kombu -async-timeout==3.0.1 # via aiohttp, aioredis -asyncpg==0.21.0 # via -r requirements/_base.in -attrs==20.3.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in, aiohttp, aioredlock, jsonschema, openapi-core -billiard==3.6.3.0 # via celery -celery[redis]==5.0.1 # via -r requirements/_base.in -cffi==1.14.2 # via cryptography -change-case==0.5.2 # via -r requirements/_base.in -chardet==3.0.4 # via aiohttp -click-didyoumean==0.0.3 # via celery -click-repl==0.1.6 # via celery -click==7.1.2 # via celery, click-didyoumean, click-repl -cryptography==3.2.1 # via -r requirements/_base.in, aiohttp-session -dataclasses==0.7 # via pydantic -dnspython==2.0.0 # via email-validator -email-validator==1.1.1 # via pydantic -expiringdict==1.2.1 # via -r requirements/_base.in -hiredis==1.1.0 # via aioredis -idna-ssl==1.1.0 # via aiohttp -idna==2.10 # via email-validator, idna-ssl, yarl -importlib-metadata==3.1.1 # via jsonschema, kombu -isodate==0.6.0 # via openapi-core -jinja-app-loader==1.0.2 # via -r requirements/_base.in -jinja2==2.11.2 # via aiohttp-jinja2, aiohttp-swagger -json2html==1.3.0 # via -r requirements/_base.in -jsondiff==1.2.0 # via -r requirements/_base.in -jsonschema==3.2.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in, openapi-spec-validator -kombu==5.0.2 # via celery -lazy-object-proxy==1.4.3 # via -r requirements/../../../../packages/service-library/requirements/_base.in, openapi-core -markupsafe==1.1.1 # via aiohttp-swagger, jinja2 -multidict==4.7.6 # via aiohttp, yarl -openapi-core==0.12.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in -openapi-spec-validator==0.2.9 # via openapi-core -pamqp==2.3.0 # via aiormq -parfive==1.0.2 # via -r requirements/_base.in -passlib==1.7.2 # via -r requirements/_base.in -prometheus-client==0.9.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in -prompt-toolkit==3.0.8 # via click-repl -psycopg2-binary==2.8.5 # via -r requirements/../../../../packages/service-library/requirements/_base.in, aiopg, sqlalchemy -pycparser==2.20 # via cffi -pydantic[email]==1.7.2 # via -r requirements/../../../../packages/models-library/requirements/_base.in, -r requirements/../../../../packages/service-library/requirements/_base.in, -r requirements/_base.in -pyrsistent==0.16.0 # via jsonschema -python-engineio==3.13.2 # via python-socketio -python-socketio==4.6.0 # via -r requirements/_base.in -pytz==2020.1 # via celery -pyyaml==5.3.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/../../../../requirements/constraints.txt, -r requirements/../../../../packages/service-library/requirements/_base.in, aiohttp-swagger, openapi-spec-validator -redis==3.5.3 # via celery -semantic-version==2.8.5 # via -r requirements/_base.in -six==1.15.0 # via click-repl, cryptography, isodate, jsonschema, openapi-core, openapi-spec-validator, pyrsistent, python-engineio, python-socketio, tenacity -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # 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, -r requirements/../../../../packages/postgres-database/requirements/_base.in, -r requirements/../../../../packages/service-library/requirements/_base.in, aiopg -strict-rfc3339==0.7 # via openapi-core -tenacity==6.2.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in -tqdm==4.54.1 # via parfive -trafaret==2.0.2 # via -r requirements/../../../../packages/service-library/requirements/_base.in -typing-extensions==3.7.4.2 # via aiohttp, yarl -ujson==3.1.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in, aiohttp-swagger -vine==5.0.0 # via amqp, celery -wcwidth==0.2.5 # via prompt-toolkit -werkzeug==1.0.1 # via -r requirements/../../../../packages/service-library/requirements/_base.in -yarl==1.5.1 # via -r requirements/../../../../packages/postgres-database/requirements/_base.in, aio-pika, aiohttp, aiormq -zipp==3.1.0 # via importlib-metadata +aio-pika==6.7.1 + # via -r requirements/_base.in +aiodebug==1.1.2 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +aiohttp-jinja2==1.2.0 + # via -r requirements/_base.in +aiohttp-security==0.4.0 + # via -r requirements/_base.in +aiohttp-session[secure]==2.9.0 + # via -r requirements/_base.in +aiohttp-swagger[performance]==1.0.15 + # via -r requirements/_base.in +aiohttp==3.6.3 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in + # aiohttp-jinja2 + # aiohttp-security + # aiohttp-session + # aiohttp-swagger + # aiozipkin + # parfive +aiopg[sa]==1.0.0 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +aioredis==1.3.1 + # via + # -r requirements/_base.in + # aioredlock +aioredlock==0.5.2 + # via -r requirements/_base.in +aiormq==3.2.3 + # via aio-pika +aiosmtplib==1.1.3 + # via -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/../../../../requirements/constraints.txt + # -r requirements/../../../../packages/service-library/requirements/_base.in +amqp==5.0.1 + # via kombu +async-timeout==3.0.1 + # via + # aiohttp + # aioredis +asyncpg==0.21.0 + # via -r requirements/_base.in +attrs==20.3.0 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # aiohttp + # aioredlock + # jsonschema + # openapi-core +billiard==3.6.3.0 + # via celery +celery[redis]==5.0.1 + # via -r requirements/_base.in +cffi==1.14.2 + # via cryptography +change-case==0.5.2 + # via -r requirements/_base.in +chardet==3.0.4 + # via aiohttp +click-didyoumean==0.0.3 + # via celery +click-repl==0.1.6 + # via celery +click==7.1.2 + # via + # celery + # click-didyoumean + # click-repl +cryptography==3.4.5 + # 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 + # -r requirements/_base.in + # aiohttp-session +dataclasses==0.7 + # via pydantic +dnspython==2.0.0 + # via email-validator +email-validator==1.1.1 + # via pydantic +expiringdict==1.2.1 + # via -r requirements/_base.in +hiredis==1.1.0 + # via aioredis +idna-ssl==1.1.0 + # via aiohttp +idna==2.10 + # 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 + # email-validator + # idna-ssl + # yarl +importlib-metadata==3.1.1 + # via + # jsonschema + # kombu +isodate==0.6.0 + # via openapi-core +jinja-app-loader==1.0.2 + # via -r requirements/_base.in +jinja2==2.11.2 + # via + # aiohttp-jinja2 + # aiohttp-swagger +json2html==1.3.0 + # via -r requirements/_base.in +jsondiff==1.2.0 + # via -r requirements/_base.in +jsonschema==3.2.0 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # openapi-spec-validator +kombu==5.0.2 + # via celery +lazy-object-proxy==1.4.3 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # openapi-core +markupsafe==1.1.1 + # via + # aiohttp-swagger + # jinja2 +multidict==4.7.6 + # via + # aiohttp + # yarl +openapi-core==0.12.0 + # via -r requirements/../../../../packages/service-library/requirements/_base.in +openapi-spec-validator==0.2.9 + # via openapi-core +pamqp==2.3.0 + # via aiormq +parfive==1.0.2 + # via -r requirements/_base.in +passlib==1.7.2 + # via -r requirements/_base.in +prometheus-client==0.9.0 + # via -r requirements/../../../../packages/service-library/requirements/_base.in +prompt-toolkit==3.0.8 + # via click-repl +psycopg2-binary==2.8.5 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # aiopg + # sqlalchemy +pycparser==2.20 + # via cffi +pydantic[email]==1.7.2 + # via + # -r requirements/../../../../packages/models-library/requirements/_base.in + # -r requirements/../../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in +pyrsistent==0.16.0 + # via jsonschema +python-engineio==3.13.2 + # via python-socketio +python-socketio==4.6.0 + # via -r requirements/_base.in +pytz==2020.1 + # via celery +pyyaml==5.3.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/../../../../requirements/constraints.txt + # -r requirements/../../../../packages/service-library/requirements/_base.in + # aiohttp-swagger + # openapi-spec-validator +redis==3.5.3 + # via celery +semantic-version==2.8.5 + # via -r requirements/_base.in +six==1.15.0 + # via + # click-repl + # isodate + # jsonschema + # openapi-core + # openapi-spec-validator + # pyrsistent + # python-engineio + # python-socketio + # tenacity +sqlalchemy[postgresql_psycopg2binary]==1.3.20 + # 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 + # -r requirements/../../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../../packages/service-library/requirements/_base.in + # aiopg +strict-rfc3339==0.7 + # via openapi-core +tenacity==6.2.0 + # via -r requirements/../../../../packages/service-library/requirements/_base.in +tqdm==4.54.1 + # via parfive +trafaret==2.0.2 + # via -r requirements/../../../../packages/service-library/requirements/_base.in +typing-extensions==3.7.4.2 + # via + # aiohttp + # yarl +ujson==3.1.0 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # aiohttp-swagger +vine==5.0.0 + # via + # amqp + # celery +wcwidth==0.2.5 + # via prompt-toolkit +werkzeug==1.0.1 + # via -r requirements/../../../../packages/service-library/requirements/_base.in +yarl==1.5.1 + # via + # -r requirements/../../../../packages/postgres-database/requirements/_base.in + # aio-pika + # aiohttp + # aiormq +zipp==3.1.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/web/server/requirements/_test.txt b/services/web/server/requirements/_test.txt index 6248bde5a58..03eac69f20e 100644 --- a/services/web/server/requirements/_test.txt +++ b/services/web/server/requirements/_test.txt @@ -4,83 +4,276 @@ # # pip-compile --output-file=requirements/_test.txt requirements/_test.in # -aiohttp==3.6.3 # via -c requirements/_base.txt, aioresponses, pytest-aiohttp -aioresponses==0.7.1 # via -r requirements/_test.in -alembic==1.4.3 # via -r requirements/_test.in -astroid==2.4.2 # via pylint -async-timeout==3.0.1 # via -c requirements/_base.txt, aiohttp -attrs==20.3.0 # via -c requirements/_base.txt, aiohttp, jsonschema, pytest, pytest-docker -bcrypt==3.2.0 # via paramiko -cached-property==1.5.2 # via docker-compose -certifi==2020.12.5 # via requests -cffi==1.14.2 # via -c requirements/_base.txt, bcrypt, cryptography, pynacl -chardet==3.0.4 # via -c requirements/_base.txt, aiohttp, requests -click==7.1.2 # via -c requirements/_base.txt, -r requirements/_test.in -codecov==2.1.10 # via -r requirements/_test.in -coverage==5.3 # via -r requirements/_test.in, codecov, coveralls, pytest-cov -coveralls==2.2.0 # via -r requirements/_test.in -cryptography==3.2.1 # via -c requirements/_base.txt, paramiko -distro==1.5.0 # via docker-compose -docker-compose==1.27.4 # via pytest-docker -docker[ssh]==4.4.0 # via -r requirements/_test.in, docker-compose -dockerpty==0.4.1 # via docker-compose -docopt==0.6.2 # via coveralls, docker-compose -faker==5.0.1 # via -r requirements/_test.in -icdiff==1.9.1 # via pytest-icdiff -idna-ssl==1.1.0 # via -c requirements/_base.txt, aiohttp -idna==2.10 # via -c requirements/_base.txt, idna-ssl, requests, yarl -importlib-metadata==3.1.1 # via -c requirements/_base.txt, jsonschema, pluggy, pytest -iniconfig==1.1.1 # via pytest -isort==4.3.21 # via pylint -jsonschema==3.2.0 # via -c requirements/_base.txt, -r requirements/_test.in, docker-compose, openapi-spec-validator -lazy-object-proxy==1.4.3 # via -c requirements/_base.txt, astroid -mako==1.1.3 # via alembic -markupsafe==1.1.1 # via -c requirements/_base.txt, mako -mccabe==0.6.1 # via pylint -multidict==4.7.6 # via -c requirements/_base.txt, aiohttp, yarl -openapi-spec-validator==0.2.9 # via -c requirements/_base.txt, -r requirements/_test.in -packaging==20.7 # via pytest, pytest-sugar -paramiko==2.7.2 # via docker -pluggy==0.13.1 # via pytest -pprintpp==0.4.0 # via pytest-icdiff -psycopg2-binary==2.8.5 # via -c requirements/_base.txt, sqlalchemy -ptvsd==4.3.2 # via -r requirements/_test.in -py==1.9.0 # via pytest -pycparser==2.20 # via -c requirements/_base.txt, cffi -pylint==2.5.0 # via -r requirements/_test.in -pynacl==1.4.0 # via paramiko -pyparsing==2.4.7 # via packaging -pyrsistent==0.16.0 # via -c requirements/_base.txt, jsonschema -pytest-aiohttp==0.3.0 # via -r requirements/_test.in -pytest-cov==2.10.1 # via -r requirements/_test.in -pytest-docker==0.10.1 # via -r requirements/_test.in -pytest-icdiff==0.5 # via -r requirements/_test.in -pytest-instafail==0.4.2 # via -r requirements/_test.in -pytest-mock==3.3.1 # via -r requirements/_test.in -pytest-runner==5.2 # via -r requirements/_test.in -pytest-sugar==0.9.4 # via -r requirements/_test.in -pytest==6.1.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-icdiff, pytest-instafail, pytest-mock, pytest-sugar -python-dateutil==2.8.1 # via alembic, faker -python-dotenv==0.15.0 # via -r requirements/_test.in, docker-compose -python-editor==1.0.4 # via alembic -pyyaml==5.3.1 # via -c requirements/../../../../requirements/constraints.txt, -c requirements/_base.txt, docker-compose, openapi-spec-validator -redis==3.5.3 # via -c requirements/_base.txt, -r requirements/_test.in -requests==2.25.0 # via codecov, coveralls, docker, docker-compose -six==1.15.0 # via -c requirements/_base.txt, astroid, bcrypt, cryptography, docker, dockerpty, jsonschema, openapi-spec-validator, pynacl, pyrsistent, python-dateutil, tenacity, websocket-client -sqlalchemy[postgresql_psycopg2binary]==1.3.20 # via -c requirements/../../../../requirements/constraints.txt, -c requirements/_base.txt, alembic -tenacity==6.2.0 # via -c requirements/_base.txt, -r requirements/_test.in -termcolor==1.1.0 # via pytest-sugar -text-unidecode==1.3 # via faker -texttable==1.6.3 # via docker-compose -toml==0.10.2 # via pylint, pytest -typed-ast==1.4.1 # via astroid -typing-extensions==3.7.4.2 # via -c requirements/_base.txt, aiohttp, yarl -urllib3==1.26.2 # via -c requirements/../../../../requirements/constraints.txt, requests -websocket-client==0.57.0 # via docker, docker-compose -websockets==8.1 # via -r requirements/_test.in -wrapt==1.12.1 # via astroid -yarl==1.5.1 # via -c requirements/_base.txt, aiohttp -zipp==3.1.0 # via -c requirements/_base.txt, importlib-metadata +aiohttp==3.6.3 + # via + # -c requirements/_base.txt + # aioresponses + # pytest-aiohttp +aioresponses==0.7.1 + # via -r requirements/_test.in +alembic==1.5.4 + # via -r requirements/_test.in +astroid==2.4.2 + # via pylint +async-timeout==3.0.1 + # via + # -c requirements/_base.txt + # aiohttp +attrs==20.3.0 + # via + # -c requirements/_base.txt + # aiohttp + # jsonschema + # pytest + # pytest-docker +bcrypt==3.2.0 + # via paramiko +cached-property==1.5.2 + # via docker-compose +certifi==2020.12.5 + # via requests +cffi==1.14.2 + # via + # -c requirements/_base.txt + # bcrypt + # cryptography + # pynacl +chardet==3.0.4 + # via + # -c requirements/_base.txt + # aiohttp + # requests +click==7.1.2 + # via + # -c requirements/_base.txt + # -r requirements/_test.in +codecov==2.1.11 + # via -r requirements/_test.in +coverage==5.4 + # via + # -r requirements/_test.in + # codecov + # coveralls + # pytest-cov +coveralls==3.0.0 + # via -r requirements/_test.in +cryptography==3.4.5 + # via + # -c requirements/../../../../requirements/constraints.txt + # -c requirements/_base.txt + # paramiko +distro==1.5.0 + # via docker-compose +docker-compose==1.27.4 + # via + # -c requirements/../../../../requirements/constraints.txt + # pytest-docker +docker[ssh]==4.4.1 + # via + # -r requirements/_test.in + # docker-compose +dockerpty==0.4.1 + # via docker-compose +docopt==0.6.2 + # via + # coveralls + # docker-compose +faker==6.1.1 + # via -r requirements/_test.in +icdiff==1.9.1 + # via pytest-icdiff +idna-ssl==1.1.0 + # via + # -c requirements/_base.txt + # aiohttp +idna==2.10 + # via + # -c requirements/../../../../requirements/constraints.txt + # -c requirements/_base.txt + # idna-ssl + # requests + # yarl +importlib-metadata==3.1.1 + # via + # -c requirements/_base.txt + # jsonschema + # pluggy + # pytest +iniconfig==1.1.1 + # via pytest +isort==4.3.21 + # via pylint +jsonschema==3.2.0 + # via + # -c requirements/_base.txt + # -r requirements/_test.in + # docker-compose + # openapi-spec-validator +lazy-object-proxy==1.4.3 + # via + # -c requirements/_base.txt + # astroid +mako==1.1.4 + # via alembic +markupsafe==1.1.1 + # via + # -c requirements/_base.txt + # mako +mccabe==0.6.1 + # via pylint +multidict==4.7.6 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +openapi-spec-validator==0.2.9 + # via + # -c requirements/_base.txt + # -r requirements/_test.in +packaging==20.9 + # via + # pytest + # pytest-sugar +paramiko==2.7.2 + # via docker +pluggy==0.13.1 + # via pytest +pprintpp==0.4.0 + # via pytest-icdiff +psycopg2-binary==2.8.5 + # via + # -c requirements/_base.txt + # sqlalchemy +ptvsd==4.3.2 + # via -r requirements/_test.in +py==1.10.0 + # via pytest +pycparser==2.20 + # via + # -c requirements/_base.txt + # cffi +pylint==2.5.0 + # via -r requirements/_test.in +pynacl==1.4.0 + # via paramiko +pyparsing==2.4.7 + # via packaging +pyrsistent==0.16.0 + # via + # -c requirements/_base.txt + # jsonschema +pytest-aiohttp==0.3.0 + # via -r requirements/_test.in +pytest-cov==2.11.1 + # via -r requirements/_test.in +pytest-docker==0.10.1 + # via -r requirements/_test.in +pytest-icdiff==0.5 + # via -r requirements/_test.in +pytest-instafail==0.4.2 + # via -r requirements/_test.in +pytest-mock==3.5.1 + # via -r requirements/_test.in +pytest-runner==5.3.0 + # via -r requirements/_test.in +pytest-sugar==0.9.4 + # via -r requirements/_test.in +pytest==6.2.2 + # via + # -r requirements/_test.in + # pytest-aiohttp + # pytest-cov + # pytest-docker + # pytest-icdiff + # pytest-instafail + # pytest-mock + # pytest-sugar +python-dateutil==2.8.1 + # via + # alembic + # faker +python-dotenv==0.15.0 + # via + # -r requirements/_test.in + # docker-compose +python-editor==1.0.4 + # via alembic +pyyaml==5.3.1 + # via + # -c requirements/../../../../requirements/constraints.txt + # -c requirements/_base.txt + # docker-compose + # openapi-spec-validator +redis==3.5.3 + # via + # -c requirements/_base.txt + # -r requirements/_test.in +requests==2.25.1 + # via + # codecov + # coveralls + # docker + # docker-compose +six==1.15.0 + # via + # -c requirements/_base.txt + # astroid + # bcrypt + # docker + # dockerpty + # jsonschema + # openapi-spec-validator + # pynacl + # pyrsistent + # python-dateutil + # tenacity + # websocket-client +sqlalchemy[postgresql_psycopg2binary]==1.3.20 + # via + # -c requirements/../../../../requirements/constraints.txt + # -c requirements/_base.txt + # alembic +tenacity==6.2.0 + # via + # -c requirements/_base.txt + # -r requirements/_test.in +termcolor==1.1.0 + # via pytest-sugar +text-unidecode==1.3 + # via faker +texttable==1.6.3 + # via docker-compose +toml==0.10.2 + # via + # pylint + # pytest +typed-ast==1.4.2 + # via astroid +typing-extensions==3.7.4.2 + # via + # -c requirements/_base.txt + # aiohttp + # yarl +urllib3==1.26.3 + # via + # -c requirements/../../../../requirements/constraints.txt + # requests +websocket-client==0.57.0 + # via + # docker + # docker-compose +websockets==8.1 + # via -r requirements/_test.in +wrapt==1.12.1 + # via astroid +yarl==1.5.1 + # via + # -c requirements/_base.txt + # aiohttp +zipp==3.1.0 + # via + # -c requirements/_base.txt + # importlib-metadata # 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 9bb56f6788d..1bb89c47bb7 100644 --- a/services/web/server/requirements/_tools.txt +++ b/services/web/server/requirements/_tools.txt @@ -4,33 +4,96 @@ # # pip-compile --output-file=requirements/_tools.txt requirements/_tools.in # -appdirs==1.4.4 # via black, virtualenv -argh==0.26.2 # via watchdog -black==20.8b1 # via -r requirements/../../../../requirements/devenv.txt -bump2version==1.0.1 # via -r requirements/../../../../requirements/devenv.txt -cfgv==3.2.0 # via pre-commit -click==7.1.2 # via -c requirements/_base.txt, -c requirements/_test.txt, black, pip-tools -dataclasses==0.7 # via -c requirements/_base.txt, black -distlib==0.3.1 # via virtualenv -filelock==3.0.12 # via virtualenv -identify==1.5.10 # via pre-commit -importlib-metadata==3.1.1 # via -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, virtualenv -importlib-resources==3.3.0 # via pre-commit, virtualenv -isort==4.3.21 # via -c requirements/_test.txt, -r requirements/../../../../requirements/devenv.txt -mypy-extensions==0.4.3 # via black -nodeenv==1.5.0 # via pre-commit -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements/../../../../requirements/devenv.txt -pre-commit==2.9.3 # via -r requirements/../../../../requirements/devenv.txt -pyyaml==5.3.1 # via -c requirements/../../../../requirements/constraints.txt, -c requirements/_base.txt, -c requirements/_test.txt, pre-commit, watchdog -regex==2020.11.13 # via black -six==1.15.0 # via -c requirements/_base.txt, -c requirements/_test.txt, pip-tools, virtualenv -toml==0.10.2 # via -c requirements/_test.txt, black, pre-commit -typed-ast==1.4.1 # via -c requirements/_test.txt, black -typing-extensions==3.7.4.2 # via -c requirements/_base.txt, -c requirements/_test.txt, black -virtualenv==20.2.2 # via pre-commit -watchdog[watchmedo]==1.0.0 # via -r requirements/_tools.in -zipp==3.1.0 # via -c requirements/_base.txt, -c requirements/_test.txt, importlib-metadata, importlib-resources +appdirs==1.4.4 + # via + # black + # virtualenv +argh==0.26.2 + # via watchdog +black==20.8b1 + # via -r requirements/../../../../requirements/devenv.txt +bump2version==1.0.1 + # via -r requirements/../../../../requirements/devenv.txt +cfgv==3.2.0 + # via pre-commit +click==7.1.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black + # pip-tools +dataclasses==0.7 + # via + # -c requirements/_base.txt + # black +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via virtualenv +identify==1.5.13 + # via pre-commit +importlib-metadata==3.1.1 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # virtualenv +importlib-resources==5.1.0 + # via + # pre-commit + # virtualenv +isort==4.3.21 + # via + # -c requirements/_test.txt + # -r requirements/../../../../requirements/devenv.txt +mypy-extensions==0.4.3 + # via black +nodeenv==1.5.0 + # via pre-commit +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements/../../../../requirements/devenv.txt +pre-commit==2.10.1 + # via -r requirements/../../../../requirements/devenv.txt +pyyaml==5.3.1 + # via + # -c requirements/../../../../requirements/constraints.txt + # -c requirements/_base.txt + # -c requirements/_test.txt + # pre-commit + # watchdog +regex==2020.11.13 + # via black +six==1.15.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # virtualenv +toml==0.10.2 + # via + # -c requirements/_test.txt + # black + # pre-commit +typed-ast==1.4.2 + # via + # -c requirements/_test.txt + # black +typing-extensions==3.7.4.2 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black +virtualenv==20.4.2 + # via pre-commit +watchdog[watchmedo]==2.0.0 + # via -r requirements/_tools.in +zipp==3.1.0 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/services/web/server/requirements/ci.txt b/services/web/server/requirements/ci.txt index ceabd7ff34c..7ba1907d1e0 100644 --- a/services/web/server/requirements/ci.txt +++ b/services/web/server/requirements/ci.txt @@ -13,7 +13,7 @@ # installs this repo's packages ../../../packages/s3wrapper/ ../../../packages/models-library/ -../../../packages/postgres-database/[migration] +../../../packages/postgres-database/ ../../../packages/simcore-sdk/ ../../../packages/service-library/ ../../../packages/pytest-simcore/ diff --git a/services/web/server/requirements/dev.txt b/services/web/server/requirements/dev.txt index 9c15bb6c3c9..55bf91d539c 100644 --- a/services/web/server/requirements/dev.txt +++ b/services/web/server/requirements/dev.txt @@ -14,7 +14,7 @@ # installs this repo's packages -e ../../../packages/s3wrapper/ -e ../../../packages/models-library/ --e ../../../packages/postgres-database/[migration] +-e ../../../packages/postgres-database/ -e ../../../packages/simcore-sdk/ -e ../../../packages/service-library/ -e ../../../packages/pytest-simcore/ diff --git a/tests/e2e/requirements/Makefile b/tests/e2e/requirements/Makefile index de1b884dce9..3ff6b1e2843 100644 --- a/tests/e2e/requirements/Makefile +++ b/tests/e2e/requirements/Makefile @@ -6,14 +6,14 @@ VENV_DIR ?= $(realpath $(ROOT_DIR)/.venv) .PHONY: reqs requirements.txt: requirements.in # pip compiling $< - @$(VENV_DIR)/bin/pip-compile --upgrade --build-isolation --output-file $@ $< + @pip-compile --upgrade --build-isolation --output-file $@ $< reqs: requirements.txt ## alias to compile requirements.txt .PHONY: install install: $(VENV_DIR) requirements.txt ## installs dependencies # installing requirements - @$