🔨 Maintenance: fixes requirement listings and scripts (ITISFoundation#3184)

pcrespov · web-flow · commit 2e85e0106f61 · 2022-07-13T09:38:03.000+02:00
diff --git a/services/datcore-adapter/requirements/_base.in b/services/datcore-adapter/requirements/_base.in
@@ -11,12 +11,12 @@
 --requirement ../../../packages/service-library/requirements/_fastapi.in
 
 
+
 aiofiles
 fastapi
 fastapi-pagination
 httpx[http2]
-uvicorn[standard]
-
-pennsieve
+pennsieve # NOTE: prevents from upgrading repo requirements/constraint on 'rsa'. Waiting for https://github.com/Pennsieve/pennsieve-python/pull/15
 pydantic[email]
 python-multipart # for fastapi multipart uploads
+uvicorn[standard]
diff --git a/services/datcore-adapter/requirements/_test.in b/services/datcore-adapter/requirements/_test.in
@@ -4,26 +4,20 @@
 --constraint ../../../requirements/constraints.txt
 --constraint _base.txt
 
-# testing
+
 asgi_lifespan
+codecov
+coverage
+coveralls
+faker
+pylint
 pytest
 pytest-asyncio
+pytest-cov
 pytest-icdiff
 pytest-instafail
 pytest-mock
 pytest-runner
 pytest-sugar
 pytest-xdist
-
-# fixtures
-faker
 respx
-
-# linter tool
-pylint
-
-# code coverage
-codecov
-coverage
-coveralls
-pytest-cov
diff --git a/services/datcore-adapter/requirements/_tools.in b/services/datcore-adapter/requirements/_tools.in
@@ -5,5 +5,4 @@
 
 --requirement ../../../requirements/devenv.txt
 
-# basic dev tools
 watchdog[watchmedo]
diff --git a/services/storage/requirements/_base.in b/services/storage/requirements/_base.in
@@ -21,4 +21,4 @@ aiopg[sa] # db
 semantic_version
 tenacity
 typer
-types-aiobotocore[s3]# s3 storage
+types-aiobotocore[s3] # s3 storage
diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt
@@ -196,6 +196,10 @@ tenacity==8.0.1
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/_base.in
+tqdm==4.64.0
+    # via
+    #   -c requirements/../../../packages/service-library/requirements/./_base.in
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
 typer==0.4.1
     # via
     #   -r requirements/../../../packages/settings-library/requirements/_base.in
diff --git a/services/web/server/requirements/_base.in b/services/web/server/requirements/_base.in
@@ -12,7 +12,7 @@
 --requirement ../../../../packages/models-library/requirements/_base.in
 --requirement ../../../../packages/postgres-database/requirements/_base.in
 --requirement ../../../../packages/settings-library/requirements/_base.in
---requirement ../../../packages/simcore-sdk/requirements/_base.in
+--requirement ../../../../packages/simcore-sdk/requirements/_base.in
 # simcore-service-library[aiohttp]
 --requirement ../../../../packages/service-library/requirements/_base.in
 --requirement ../../../../packages/service-library/requirements/_aiohttp.in
diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt
@@ -6,15 +6,20 @@
 #
 aio-pika==7.2.0
     # via -r requirements/_base.in
+aiocache==0.11.1
+    # via -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
 aiodebug==2.3.0
     # via
     #   -c requirements/../../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/_base.in
 aiofiles==0.8.0
     # via
     #   -c requirements/../../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
 aiohttp==3.8.1
     # via
@@ -23,8 +28,14 @@ aiohttp==3.8.1
     #   -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../requirements/constraints.txt
     #   -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
     #   aiohttp-jinja2
     #   aiohttp-security
@@ -43,6 +54,7 @@ aiohttp-swagger==1.0.16
 aiopg==1.3.3
     # via
     #   -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
 aiormq==6.2.3
     # via aio-pika
@@ -53,7 +65,9 @@ aiosmtplib==1.1.6
 aiozipkin==1.1.1
     # via -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
 alembic==1.8.0
-    # via -r requirements/../../../../packages/postgres-database/requirements/_base.in
+    # via
+    #   -r requirements/../../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
 async-timeout==4.0.2
     # via
     #   aiohttp
@@ -65,6 +79,7 @@ attrs==20.3.0
     # via
     #   -c requirements/../../../../packages/service-library/requirements/././constraints.txt
     #   -c requirements/../../../../packages/service-library/requirements/./constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt
     #   -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
     #   aiohttp
     #   jsonschema
@@ -82,6 +97,11 @@ cryptography==37.0.2
     #   -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../requirements/constraints.txt
     #   -r requirements/_base.in
     #   aiohttp-session
@@ -118,6 +138,11 @@ jinja2==3.1.2
     #   -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../requirements/constraints.txt
     #   aiohttp-jinja2
     #   aiohttp-swagger
@@ -129,8 +154,10 @@ jsonschema==3.2.0
     # via
     #   -c requirements/../../../../packages/service-library/requirements/././constraints.txt
     #   -c requirements/../../../../packages/service-library/requirements/./constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt
     #   -r requirements/../../../../packages/models-library/requirements/_base.in
     #   -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in
     #   openapi-schema-validator
     #   openapi-spec-validator
 lazy-object-proxy==1.4.3
@@ -159,6 +186,7 @@ orjson==3.7.2
     # via -r requirements/_base.in
 packaging==21.3
     # via
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
     #   redis
 pamqp==3.1.0
@@ -168,7 +196,9 @@ parfive==1.5.1
 passlib==1.7.4
     # via -r requirements/_base.in
 pint==0.19.2
-    # via -r requirements/_base.in
+    # via
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
+    #   -r requirements/_base.in
 prometheus-client==0.14.1
     # via -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
 psycopg2-binary==2.9.3
@@ -185,16 +215,26 @@ pydantic==1.9.0
     #   -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/service-library/requirements/./_base.in
     #   -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../requirements/constraints.txt
     #   -r requirements/../../../../packages/models-library/requirements/_base.in
     #   -r requirements/../../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../../packages/settings-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
 pyinstrument==3.4.2
     # via
     #   -c requirements/../../../../packages/service-library/requirements/./_base.in
     #   -c requirements/./constraints.txt
     #   -r requirements/../../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
 pyinstrument-cext==0.2.4
     # via pyinstrument
 pyparsing==3.0.9
@@ -217,8 +257,15 @@ pyyaml==5.4.1
     #   -c requirements/../../../../packages/service-library/requirements/./_base.in
     #   -c requirements/../../../../packages/service-library/requirements/./constraints.txt
     #   -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../requirements/constraints.txt
     #   -r requirements/../../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
     #   aiohttp-swagger
     #   openapi-spec-validator
 redis==4.3.1
@@ -239,8 +286,14 @@ sqlalchemy==1.4.37
     #   -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
     #   -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../../requirements/constraints.txt
     #   -r requirements/../../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
     #   aiopg
     #   alembic
 strict-rfc3339==0.7
@@ -249,11 +302,20 @@ tenacity==8.0.1
     # via
     #   -c requirements/../../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
 tqdm==4.64.0
-    # via parfive
+    # via
+    #   -c requirements/../../../../packages/service-library/requirements/./_base.in
+    #   -r requirements/../../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/_base.in
+    #   parfive
 typer==0.4.1
-    # via -r requirements/../../../../packages/settings-library/requirements/_base.in
+    # via
+    #   -r requirements/../../../../packages/settings-library/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in
 typing-extensions==4.2.0
     # via
     #   aiodebug
@@ -268,6 +330,7 @@ yarl==1.5.1
     # via
     #   -c requirements/./constraints.txt
     #   -r requirements/../../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq
diff --git a/tests/e2e/requirements/Makefile b/tests/e2e/requirements/Makefile
@@ -1,25 +1,12 @@
-.DEFAULT_GOAL := help
+#
+# Targets to pip-compile requirements
+#
+include ../../../requirements/base.Makefile
 
-ROOT_DIR  = $(realpath $(CURDIR)/../../../)
-VENV_DIR ?= $(realpath $(ROOT_DIR)/.venv)
+VENV_DIR ?= $(realpath $(REPO_BASE_DIR)/.venv)
 
-.PHONY: reqs
-requirements.txt: requirements.in
-	# pip compiling $<
-	@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
 	@pip install -r requirements.txt
-
-
-.PHONY: help
-# thanks to https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
-help: ## this colorful help
-	@echo "Recipes for tests/swarm-deploy:"
-	@echo ""
-	@awk --posix 'BEGIN {FS = ":.*?## "} /^[[:alpha:][:space:]_-]+:.*?## / {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
-	@echo ""
diff --git a/tests/e2e/requirements/requirements.txt b/tests/e2e/requirements/requirements.txt
@@ -2,27 +2,27 @@
 # This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile --output-file=requirements.txt requirements.in
+#    pip-compile --output-file=requirements/requirements.txt --strip-extras requirements/requirements.in
 #
 certifi==2022.5.18.1
     # via requests
 charset-normalizer==2.0.12
     # via requests
 docker==5.0.3
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 idna==3.3
     # via requests
 pyyaml==6.0
     # via
-    #   -c ../../../requirements/constraints.txt
-    #   -r requirements.in
+    #   -c requirements/../../../requirements/constraints.txt
+    #   -r requirements/requirements.in
 requests==2.27.1
     # via docker
 tenacity==8.0.1
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 urllib3==1.26.9
     # via
-    #   -c ../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
     #   requests
 websocket-client==1.3.2
     # via docker

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,4 @@`
`5`	`5`
`6`	`6`	`--requirement ../../../requirements/devenv.txt`
`7`	`7`
`8`		`-# basic dev tools`
`9`	`8`	`watchdog[watchmedo]`