drafted requirements

services/director/requirements/Makefile

@@ -4,10 +4,3 @@
 include ../../../requirements/base.Makefile
 
 # Add here any extra explicit dependency: e.g. _migration.txt: _base.txt
-
-
-_test.txt: _base.txt _test.in
-	## NOTE: this recipe override has to be removed
-	## to execute target upgrades e.g. due to vulnerability of
-	## a library.
-	@echo INFO: test.txt is frozen. Skipping upgrade.

services/director/requirements/_base.in

@@ -1,70 +1,19 @@
 #
-# Specifies third-party dependencies for 'director'
+# Specifies third-party dependencies for 'services/web/server/src'
 #
+--constraint ../../../requirements/constraints.txt
 
-#  IMPORTANT: All requirements (including the packages in this repository) as FROZEN to those in itisfoundation/director:master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0
-#    - current service is going to be replaced by director-v2
-#
-#
+# intra-repo required dependencies
+--requirement ../../../packages/models-library/requirements/_base.in
+--requirement ../../../packages/settings-library/requirements/_base.in
 
-# This list was obtained as follows
-#
-# $ docker pull itisfoundation/director:master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0
-#    master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0: Pulling from itisfoundation/director
-#    Digest: sha256:84ba999ca348bf9d56d9ef0af2e3494ede0cd06d357d289e2a09a4191e7a56d3
-#    Status: Image is up to date for itisfoundation/director:master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0
-#    docker.io/itisfoundation/director:master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0
-#
-# $ docker inspect itisfoundation/director:master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0| jq '.[0] | .RepoTags, .ContainerConfig.Labels'
-#    [
-#      "itisfoundation/director:master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0"
-#    ]
-#    {
-#      "io.osparc.api-version": "0.1.0",
-#      "maintainer": "sanderegg",
-#      "org.label-schema.build-date": "2020-11-05T14:02:31Z",
-#      "org.label-schema.schema-version": "1.0",
-#      "org.label-schema.vcs-ref": "c8669fb",
-#      "org.label-schema.vcs-url": "https://github.com/ITISFoundation/osparc-simcore.git"
-#    }
-#
-# $ docker run -it itisfoundation/director:master-2020-11-05--14-45.c8669fb52659b684514fefa4f3b4599f57f276a0 pip freeze
-#
+# service-library[fastapi]
+--requirement ../../../packages/service-library/requirements/_base.in
+--requirement ../../../packages/service-library/requirements/_fastapi.in
 
 
-aiodebug==1.1.2
-aiodocker==0.14.0
-aiohttp==3.3.2
-aiohttp-apiset @ git+https://github.com/ITISFoundation/aiohttp_apiset.git@5c8a61ceb6de7ed9e09db5b4609b458a0d3773df
-aiopg==1.0.0
-aiozipkin==0.7.1
-async-generator==1.10
-async-timeout==3.0.1
-asyncio-extras==1.3.2
-attrs==20.2.0
-certifi==2019.3.9
-chardet==3.0.4
-dataclasses==0.7
-idna==2.8
-idna-ssl==1.1.0
-isodate==0.6.0
-jsonschema==2.6.0
-lazy-object-proxy==1.4.3
-multidict==4.5.2
-openapi-core==0.12.0
-openapi-spec-validator==0.2.9
-prometheus-client==0.8.0
-psycopg2-binary==2.8.6
-pydantic==1.7.2
-PyYAML==5.4 # CVE-2020-1747
-requests==2.27.1 #
-simcore-service-library @ git+https://github.com/ITISFoundation/osparc-simcore.git@c8669fb52659b684514fefa4f3b4599f57f276a0#egg=simcore-service-library&subdirectory=packages/service-library
-six==1.12.0
-SQLAlchemy==1.3.20
-strict-rfc3339==0.7
-tenacity==6.0.0
-trafaret==2.1.0
-ujson==4.0.1
-urllib3==1.26.5 # CVE-2021-33503
-Werkzeug==1.0.1
-yarl==1.3.0
+aiodocker
+fastapi[all]
+httpx
+prometheus-client
+pydantic

services/director/requirements/_test.in

@@ -1,32 +1,23 @@
+# Specifies dependencies required to run 'services/api-server/test'
+#  both for unit and integration tests!!
 #
-# Specifies dependencies required to run 'director'
-#
-
-# frozen specs
---requirement _base.txt
+--constraint ../../../requirements/constraints.txt
 
-# NOTE:
-# FROZEN  (see notes in _base.in)
-# DO NOT CHANGE ANYTHING HERE.
-# IT WON'T HAVE ANY EFFECT
+# Adds base AS CONSTRAINT specs, not requirement.
+#  - Resulting _text.txt is a frozen list of EXTRA packages for testing, besides _base.txt
 #
-
-# FROZEN as well (DO NOT CHANGE anything in pytest-simcore, it will have no effect in the director package)
-pytest-simcore @  git+https://github.com/ITISFoundation/osparc-simcore.git@79f866219bf650c5eeb4fcdf8f017319087c92c7#egg=pytest-simcore&subdirectory=packages/pytest-simcore
-
+--constraint _base.txt
 
 # testing
-aioresponses
-coverage==4.5.1 # TODO: Downgraded because of a bug https://github.com/nedbat/coveragepy/issues/716
 docker
-openapi-spec-validator~=0.2  # TODO: this library is limiting jsonschema<3
-ptvsd
-pylint
+faker
+jsonref
 pytest
-pytest-aiohttp  # incompatible with pytest-asyncio. See https://github.com/pytest-dev/pytest-asyncio/issues/76
+pytest-asyncio
 pytest-cov
+pytest-docker
 pytest-instafail
 pytest-mock
 pytest-runner
 pytest-sugar
-python-dotenv
+respx