propagate downstream dependencies everywhere

ITISFoundation · Dec 4, 2024 · fb06946 · fb06946
1 parent deeb0f1
commit fb06946
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 40 deletions.
diff --git a/packages/notifications-library/requirements/_base.txt b/packages/notifications-library/requirements/_base.txt
@@ -154,6 +154,8 @@ rpds-py==0.20.0
     #   referencing
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
 six==1.16.0
     # via python-dateutil
 sqlalchemy==1.4.54

diff --git a/packages/postgres-database/requirements/_base.in b/packages/postgres-database/requirements/_base.in
@@ -6,8 +6,8 @@
 --requirement ../../../packages/common-library/requirements/_base.in
 
 alembic
+opentelemetry-instrumentation-asyncpg
 pydantic
+shortuuid
 sqlalchemy[postgresql_psycopg2binary,postgresql_asyncpg] # SEE extras in https://github.com/sqlalchemy/sqlalchemy/blob/main/setup.cfg#L43
-opentelemetry-instrumentation-asyncpg
 yarl
-shortuuid
diff --git a/packages/postgres-database/requirements/_base.txt b/packages/postgres-database/requirements/_base.txt
@@ -1,11 +1,5 @@
-#
-# This file is autogenerated by pip-compile with Python 3.11
-# by the following command:
-#
-#    pip-compile _base.in
-#
 alembic==1.13.3
-    # via -r _base.in
+    # via -r requirements/_base.in
 annotated-types==0.7.0
     # via pydantic
 async-timeout==4.0.3
@@ -24,8 +18,8 @@ importlib-metadata==8.4.0
     # via opentelemetry-api
 mako==1.3.5
     # via
-    #   -c ../../../packages/common-library/requirements/../../../requirements/constraints.txt
-    #   -c ../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
     #   alembic
 markupsafe==2.1.5
     # via mako
@@ -39,34 +33,36 @@ opentelemetry-api==1.27.0
 opentelemetry-instrumentation==0.48b0
     # via opentelemetry-instrumentation-asyncpg
 opentelemetry-instrumentation-asyncpg==0.48b0
-    # via -r _base.in
+    # via -r requirements/_base.in
 opentelemetry-semantic-conventions==0.48b0
     # via opentelemetry-instrumentation-asyncpg
 orjson==3.10.11
     # via
-    #   -c ../../../packages/common-library/requirements/../../../requirements/constraints.txt
-    #   -c ../../../requirements/constraints.txt
-    #   -r ../../../packages/common-library/requirements/_base.in
+    #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   -r requirements/../../../packages/common-library/requirements/_base.in
 psycopg2-binary==2.9.9
     # via sqlalchemy
 pydantic==2.9.2
     # via
-    #   -c ../../../packages/common-library/requirements/../../../requirements/constraints.txt
-    #   -c ../../../requirements/constraints.txt
-    #   -r ../../../packages/common-library/requirements/_base.in
-    #   -r _base.in
+    #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   -r requirements/../../../packages/common-library/requirements/_base.in
+    #   -r requirements/_base.in
     #   pydantic-extra-types
 pydantic-core==2.23.4
     # via pydantic
 pydantic-extra-types==2.10.0
-    # via -r ../../../packages/common-library/requirements/_base.in
+    # via -r requirements/../../../packages/common-library/requirements/_base.in
+setuptools==75.6.0
+    # via opentelemetry-instrumentation
 shortuuid==1.0.13
-    # via -r _base.in
-sqlalchemy[postgresql-asyncpg,postgresql-psycopg2binary,postgresql_asyncpg,postgresql_psycopg2binary]==1.4.54
+    # via -r requirements/_base.in
+sqlalchemy==1.4.54
     # via
-    #   -c ../../../packages/common-library/requirements/../../../requirements/constraints.txt
-    #   -c ../../../requirements/constraints.txt
-    #   -r _base.in
+    #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   -r requirements/_base.in
     #   alembic
 typing-extensions==4.12.2
     # via
@@ -79,9 +75,6 @@ wrapt==1.16.0
     #   deprecated
     #   opentelemetry-instrumentation
 yarl==1.12.1
-    # via -r _base.in
+    # via -r requirements/_base.in
 zipp==3.20.2
     # 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
@@ -69,7 +69,9 @@ pyyaml==6.0.2
 ruff==0.8.1
     # via -r requirements/../../../requirements/devenv.txt
 setuptools==75.6.0
-    # via pip-tools
+    # via
+    #   -c requirements/_base.txt
+    #   pip-tools
 tomlkit==0.13.2
     # via pylint
 typing-extensions==4.12.2

diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt
@@ -352,7 +352,6 @@ redis==5.0.4
     #   -r requirements/../../../packages/service-library/requirements/_base.in
 referencing==0.29.3
     # via
-    #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
     #   jsonschema
     #   jsonschema-specifications
 repro-zipfile==0.3.1
@@ -372,6 +371,8 @@ setuptools==75.1.0
     # via opentelemetry-instrumentation
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
 six==1.16.0
     # via python-dateutil
 sniffio==1.3.1
@@ -450,6 +451,7 @@ wrapt==1.16.0
 yarl==1.12.1
     # via
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq

diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt
@@ -819,6 +819,10 @@ setuptools==74.0.0
     # via opentelemetry-instrumentation
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via
+    #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
 simple-websocket==1.0.0
     # via python-engineio
 six==1.16.0

diff --git a/services/director/requirements/_base.txt b/services/director/requirements/_base.txt
@@ -388,7 +388,6 @@ redis==5.2.0
     #   -r requirements/../../../packages/service-library/requirements/_base.in
 referencing==0.29.3
     # via
-    #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
     #   jsonschema
     #   jsonschema-specifications
 repro-zipfile==0.3.1
@@ -501,6 +500,7 @@ wrapt==1.16.0
     #   opentelemetry-instrumentation-redis
 yarl==1.17.1
     # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq

diff --git a/services/dynamic-scheduler/requirements/_base.txt b/services/dynamic-scheduler/requirements/_base.txt
@@ -471,6 +471,8 @@ rpds-py==0.21.0
     #   referencing
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
 simple-websocket==1.1.0
     # via python-engineio
 six==1.16.0

diff --git a/services/dynamic-sidecar/requirements/_base.txt b/services/dynamic-sidecar/requirements/_base.txt
@@ -641,6 +641,10 @@ rpds-py==0.21.0
     #   referencing
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via
+    #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
 simple-websocket==1.1.0
     # via python-engineio
 six==1.16.0

diff --git a/services/efs-guardian/requirements/_base.txt b/services/efs-guardian/requirements/_base.txt
@@ -580,8 +580,6 @@ redis==5.1.1
     #   -r requirements/../../../packages/service-library/requirements/_base.in
 referencing==0.29.3
     # via
-    #   -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/./constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
     #   jsonschema
     #   jsonschema-specifications
 repro-zipfile==0.3.1
@@ -609,6 +607,8 @@ sh==2.1.0
     # via -r requirements/../../../packages/aws-library/requirements/_base.in
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
 six==1.16.0
     # via python-dateutil
 sniffio==1.3.1
@@ -758,7 +758,9 @@ wrapt==1.16.0
     #   opentelemetry-instrumentation-redis
 yarl==1.15.4
     # via
+    #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq

diff --git a/services/payments/requirements/_base.txt b/services/payments/requirements/_base.txt
@@ -492,6 +492,8 @@ rsa==4.9
     #   python-jose
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
 simple-websocket==1.1.0
     # via python-engineio
 six==1.16.0

diff --git a/services/resource-usage-tracker/requirements/_base.txt b/services/resource-usage-tracker/requirements/_base.txt
@@ -620,8 +620,6 @@ redis==5.0.4
     #   -r requirements/../../../packages/service-library/requirements/_base.in
 referencing==0.29.3
     # via
-    #   -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/./constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
     #   jsonschema
     #   jsonschema-specifications
 regex==2023.12.25
@@ -655,7 +653,9 @@ sh==2.0.6
 shellingham==1.5.4
     # via typer
 shortuuid==1.0.13
-    # via -r requirements/_base.in
+    # via
+    #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/_base.in
 six==1.16.0
     # via python-dateutil
 sniffio==1.3.1
@@ -819,7 +819,9 @@ wrapt==1.16.0
     #   opentelemetry-instrumentation-redis
 yarl==1.9.4
     # via
+    #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq

diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt
@@ -605,6 +605,8 @@ sh==2.0.6
     # via -r requirements/../../../packages/aws-library/requirements/_base.in
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
 six==1.16.0
     # via python-dateutil
 sniffio==1.3.1
@@ -761,7 +763,9 @@ wrapt==1.16.0
     #   opentelemetry-instrumentation-redis
 yarl==1.9.4
     # via
+    #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq

diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt
@@ -120,7 +120,7 @@ certifi==2024.8.30
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/../../../packages/postgres-database/requirements/_migration.txt
     #   requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via
     #   -r requirements/../../../packages/postgres-database/requirements/_migration.txt
     #   requests
@@ -565,8 +565,6 @@ redis==5.0.4
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
 referencing==0.29.3
     # via
-    #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
-    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt
     #   jsonschema
     #   jsonschema-specifications
 repro-zipfile==0.3.1
@@ -593,6 +591,8 @@ setuptools==75.1.0
     # via opentelemetry-instrumentation
 shellingham==1.5.4
     # via typer
+shortuuid==1.0.13
+    # via -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
 six==1.16.0
     # via python-dateutil
 sniffio==1.3.1
@@ -707,7 +707,9 @@ wrapt==1.16.0
     #   opentelemetry-instrumentation-redis
 yarl==1.12.1
     # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
+    #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq