From 2e105aa30f00a6ccc9d126e7d1190a85181381c7 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:38:46 +0200 Subject: [PATCH 1/2] revert code to newer version --- .../service-library/src/servicelib/deferred_tasks/_utils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/service-library/src/servicelib/deferred_tasks/_utils.py b/packages/service-library/src/servicelib/deferred_tasks/_utils.py index bcff7e274e12..dd71341bad6f 100644 --- a/packages/service-library/src/servicelib/deferred_tasks/_utils.py +++ b/packages/service-library/src/servicelib/deferred_tasks/_utils.py @@ -30,8 +30,6 @@ async def wrapper(*args, **kwargs): f"Please check code at: '{func.__module__}.{func.__name__}'" ) _logger.exception(msg) - # NOTE: the new version of fast-depends allows to pass a parameter until then we keep it simple - # raise RejectMessage(reason=msg) from e - raise RejectMessage from e + raise RejectMessage(reason=msg) from e return wrapper From 2ba0f9dd6843e9afd74e5320cb18d3c841194fb1 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:41:48 +0200 Subject: [PATCH 2/2] upgrade to fast-depends 2.4.12 everywhere --- packages/aws-library/requirements/_base.txt | 2 +- packages/service-library/requirements/_base.txt | 2 +- packages/simcore-sdk/requirements/_base.txt | 2 +- services/agent/requirements/_base.txt | 2 +- services/api-server/requirements/_base.txt | 2 +- services/autoscaling/requirements/_base.txt | 2 +- services/catalog/requirements/_base.txt | 2 +- services/clusters-keeper/requirements/_base.txt | 2 +- services/dask-sidecar/requirements/_base.txt | 2 +- services/datcore-adapter/requirements/_base.txt | 2 +- services/director-v2/requirements/_base.txt | 2 +- services/dynamic-scheduler/requirements/_base.txt | 2 +- services/dynamic-sidecar/requirements/_base.txt | 2 +- services/invitations/requirements/_base.txt | 2 +- services/payments/requirements/_base.txt | 2 +- services/resource-usage-tracker/requirements/_base.txt | 2 +- services/storage/requirements/_base.txt | 2 +- services/web/server/requirements/_base.txt | 2 +- tests/swarm-deploy/requirements/_test.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/aws-library/requirements/_base.txt b/packages/aws-library/requirements/_base.txt index 01e0157d9346..b9681f9234ac 100644 --- a/packages/aws-library/requirements/_base.txt +++ b/packages/aws-library/requirements/_base.txt @@ -81,7 +81,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.2.0 # via pydantic -fast-depends==2.4.11 +fast-depends==2.4.12 # via faststream faststream==0.5.23 # via -r requirements/../../../packages/service-library/requirements/_base.in diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt index bee8270701bd..2b33eb1efade 100644 --- a/packages/service-library/requirements/_base.txt +++ b/packages/service-library/requirements/_base.txt @@ -53,7 +53,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.2.0 # via pydantic -fast-depends==2.4.11 +fast-depends==2.4.12 # via faststream faststream==0.5.23 # via -r requirements/_base.in diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index 26a197a8fa9b..869c0eb387cf 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -79,7 +79,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.2.0 # via pydantic -fast-depends==2.4.11 +fast-depends==2.4.12 # via faststream faststream==0.5.23 # via -r requirements/../../../packages/service-library/requirements/_base.in diff --git a/services/agent/requirements/_base.txt b/services/agent/requirements/_base.txt index 9fbcc0838aba..62147f3705b7 100644 --- a/services/agent/requirements/_base.txt +++ b/services/agent/requirements/_base.txt @@ -70,7 +70,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.2.0 # via pydantic -fast-depends==2.4.11 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 5bc43dad29db..50006691f4ee 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -136,7 +136,7 @@ email-validator==2.1.1 # via # fastapi # pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/autoscaling/requirements/_base.txt b/services/autoscaling/requirements/_base.txt index ee6878dd43b0..927f1ccf5dd6 100644 --- a/services/autoscaling/requirements/_base.txt +++ b/services/autoscaling/requirements/_base.txt @@ -129,7 +129,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index 5ed5819a1250..2e20eb89be0e 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -81,7 +81,7 @@ email-validator==2.1.1 # via # fastapi # pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/clusters-keeper/requirements/_base.txt b/services/clusters-keeper/requirements/_base.txt index f6226e21629d..6c53105c403e 100644 --- a/services/clusters-keeper/requirements/_base.txt +++ b/services/clusters-keeper/requirements/_base.txt @@ -127,7 +127,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt index e7c00c528e0b..6d776591b157 100644 --- a/services/dask-sidecar/requirements/_base.txt +++ b/services/dask-sidecar/requirements/_base.txt @@ -106,7 +106,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream faststream==0.5.10 # via -r requirements/../../../packages/service-library/requirements/_base.in diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt index ed00053e60d5..9cb77e4a359d 100644 --- a/services/datcore-adapter/requirements/_base.txt +++ b/services/datcore-adapter/requirements/_base.txt @@ -77,7 +77,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index 7a524e686196..d4a5c75eb698 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -154,7 +154,7 @@ email-validator==2.1.1 # via # fastapi # pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/dynamic-scheduler/requirements/_base.txt b/services/dynamic-scheduler/requirements/_base.txt index 714f37a8b3e3..f088dd12890b 100644 --- a/services/dynamic-scheduler/requirements/_base.txt +++ b/services/dynamic-scheduler/requirements/_base.txt @@ -78,7 +78,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/dynamic-sidecar/requirements/_base.txt b/services/dynamic-sidecar/requirements/_base.txt index 49082d6f5085..303234d7f0c1 100644 --- a/services/dynamic-sidecar/requirements/_base.txt +++ b/services/dynamic-sidecar/requirements/_base.txt @@ -120,7 +120,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/invitations/requirements/_base.txt b/services/invitations/requirements/_base.txt index 5930af799f32..e0f4fcf73b61 100644 --- a/services/invitations/requirements/_base.txt +++ b/services/invitations/requirements/_base.txt @@ -78,7 +78,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/payments/requirements/_base.txt b/services/payments/requirements/_base.txt index 9c6ed81bca47..28bfb2a340b2 100644 --- a/services/payments/requirements/_base.txt +++ b/services/payments/requirements/_base.txt @@ -95,7 +95,7 @@ ecdsa==0.19.0 # via python-jose email-validator==2.2.0 # via pydantic -fast-depends==2.4.7 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/resource-usage-tracker/requirements/_base.txt b/services/resource-usage-tracker/requirements/_base.txt index d31e353e4c39..7fbdfdb92e61 100644 --- a/services/resource-usage-tracker/requirements/_base.txt +++ b/services/resource-usage-tracker/requirements/_base.txt @@ -126,7 +126,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream fastapi==0.99.1 # via diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index 69d470d7fa34..0e2728ec7a0c 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -125,7 +125,7 @@ dnspython==2.6.1 # via email-validator email-validator==2.1.1 # via pydantic -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream faststream==0.5.10 # via diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index bf5eb3e7c293..2eab661ddef9 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -160,7 +160,7 @@ et-xmlfile==1.1.0 # via openpyxl faker==19.6.1 # via -r requirements/_base.in -fast-depends==2.4.2 +fast-depends==2.4.12 # via faststream faststream==0.5.10 # via diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt index 467cf442c6b3..a468b66afafd 100644 --- a/tests/swarm-deploy/requirements/_test.txt +++ b/tests/swarm-deploy/requirements/_test.txt @@ -117,7 +117,7 @@ docker==7.1.0 # -r requirements/_test.in email-validator==2.2.0 # via pydantic -fast-depends==2.4.11 +fast-depends==2.4.12 # via faststream faststream==0.5.23 # via