From 344df55137a683762c424eff3c24aeed9b356cd4 Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Mon, 16 Sep 2024 12:04:16 +0200 Subject: [PATCH 1/9] added unique generation of token that persists during each container run --- .../src/servicelib/rabbitmq/_utils.py | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/service-library/src/servicelib/rabbitmq/_utils.py b/packages/service-library/src/servicelib/rabbitmq/_utils.py index 716d8e2adae..35895650c21 100644 --- a/packages/service-library/src/servicelib/rabbitmq/_utils.py +++ b/packages/service-library/src/servicelib/rabbitmq/_utils.py @@ -1,6 +1,9 @@ import logging import socket +from pathlib import Path +from tempfile import gettempdir from typing import Any, Final +from uuid import uuid4 import aio_pika from aiormq.exceptions import ChannelPreconditionFailed @@ -19,6 +22,10 @@ RABBIT_QUEUE_MESSAGE_DEFAULT_TTL_MS: Final[int] = 15 * _MINUTE * 1000 +_PATH_UNIQUE_RABBIT_QUEUE_PREFIX: Final[Path] = ( + Path(gettempdir()) / f"{__name__}_unique_rabbit_queue_prefix" +) + class RabbitMQRetryPolicyUponInitialization: """Retry policy upon service initialization""" @@ -50,8 +57,21 @@ async def wait_till_rabbitmq_responsive(url: str) -> bool: return await is_rabbitmq_responsive(url) +def _get_unique_rabbit_queue_prefix() -> str: + # NOTE: TODO: finish notes with reasons for this + prefix: str | None = None + if _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.exists(): + prefix = _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.read_text() + + if prefix is None: + prefix = f"{socket.gethostname()}_{f'{uuid4()}'[:6]}" + _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.write_text(prefix) + + return prefix + + def get_rabbitmq_client_unique_name(base_name: str) -> str: - return f"{base_name}_{socket.gethostname()}" + return f"{base_name}_{_get_unique_rabbit_queue_prefix()}" async def declare_queue( From d61d002a6159315d38b38d34c40be26bf39f5349 Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Mon, 16 Sep 2024 13:39:16 +0200 Subject: [PATCH 2/9] updated docstring --- .../src/servicelib/rabbitmq/_utils.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/service-library/src/servicelib/rabbitmq/_utils.py b/packages/service-library/src/servicelib/rabbitmq/_utils.py index 35895650c21..a2e23c7a5ad 100644 --- a/packages/service-library/src/servicelib/rabbitmq/_utils.py +++ b/packages/service-library/src/servicelib/rabbitmq/_utils.py @@ -1,9 +1,10 @@ import logging +import random import socket +import string from pathlib import Path from tempfile import gettempdir from typing import Any, Final -from uuid import uuid4 import aio_pika from aiormq.exceptions import ChannelPreconditionFailed @@ -25,6 +26,8 @@ _PATH_UNIQUE_RABBIT_QUEUE_PREFIX: Final[Path] = ( Path(gettempdir()) / f"{__name__}_unique_rabbit_queue_prefix" ) +_ALPHABET: Final[str] = string.ascii_letters + string.digits +_CHAR_COUNT: Final[NonNegativeInt] = 6 class RabbitMQRetryPolicyUponInitialization: @@ -57,21 +60,26 @@ async def wait_till_rabbitmq_responsive(url: str) -> bool: return await is_rabbitmq_responsive(url) -def _get_unique_rabbit_queue_prefix() -> str: - # NOTE: TODO: finish notes with reasons for this +def _get_unique_rabbit_queue_name_prefix() -> str: + # NOTE: this prefix is guaranteed to be unique for the entire lifecycle of the docker container + # Why is this desiarable? + # 1. the code base makes the above assumption, otherwise subcscribers and consumers do not work + # 2. enables restaratability of production deployemnts, where containers are frist created and + # then killed; avoids overlapping queue names and errors during start prefix: str | None = None if _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.exists(): prefix = _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.read_text() if prefix is None: - prefix = f"{socket.gethostname()}_{f'{uuid4()}'[:6]}" + random_str = "".join(random.choices(_ALPHABET, k=_CHAR_COUNT)) # noqa: S311 + prefix = f"{socket.gethostname()}_{random_str}" _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.write_text(prefix) return prefix def get_rabbitmq_client_unique_name(base_name: str) -> str: - return f"{base_name}_{_get_unique_rabbit_queue_prefix()}" + return f"{base_name}_{_get_unique_rabbit_queue_name_prefix()}" async def declare_queue( From 1ba4072b450df97423b62e59a6ee39fc01d2948e Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Mon, 16 Sep 2024 17:16:54 +0200 Subject: [PATCH 3/9] rename notes --- packages/service-library/src/servicelib/rabbitmq/_utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/service-library/src/servicelib/rabbitmq/_utils.py b/packages/service-library/src/servicelib/rabbitmq/_utils.py index a2e23c7a5ad..1e4defe2766 100644 --- a/packages/service-library/src/servicelib/rabbitmq/_utils.py +++ b/packages/service-library/src/servicelib/rabbitmq/_utils.py @@ -64,8 +64,7 @@ def _get_unique_rabbit_queue_name_prefix() -> str: # NOTE: this prefix is guaranteed to be unique for the entire lifecycle of the docker container # Why is this desiarable? # 1. the code base makes the above assumption, otherwise subcscribers and consumers do not work - # 2. enables restaratability of production deployemnts, where containers are frist created and - # then killed; avoids overlapping queue names and errors during start + # 2. enables restartability of webserver during [re]deploys prefix: str | None = None if _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.exists(): prefix = _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.read_text() From e8f569869c4a10a44f126e180241107b1559ae0b Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Mon, 16 Sep 2024 17:29:33 +0200 Subject: [PATCH 4/9] TODO: check what else fails --- packages/service-library/src/servicelib/rabbitmq/_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/service-library/src/servicelib/rabbitmq/_utils.py b/packages/service-library/src/servicelib/rabbitmq/_utils.py index 1e4defe2766..2408897dcb6 100644 --- a/packages/service-library/src/servicelib/rabbitmq/_utils.py +++ b/packages/service-library/src/servicelib/rabbitmq/_utils.py @@ -97,7 +97,8 @@ async def declare_queue( "durable": True, "exclusive": exclusive_queue, "arguments": default_arguments, - "name": f"{get_rabbitmq_client_unique_name(client_name)}_{exchange_name}_exclusive", + # no names for exclusive queues + # "name": f"{get_rabbitmq_client_unique_name(client_name)}_{exchange_name}_exclusive", } if not exclusive_queue: # NOTE: setting a name will ensure multiple instance will take their data here From d06ea65c8563477f492f7f8821004726817350cb Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Tue, 17 Sep 2024 14:10:44 +0200 Subject: [PATCH 5/9] simplify implementation --- .../src/servicelib/rabbitmq/_utils.py | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/packages/service-library/src/servicelib/rabbitmq/_utils.py b/packages/service-library/src/servicelib/rabbitmq/_utils.py index 2408897dcb6..361888cc3f6 100644 --- a/packages/service-library/src/servicelib/rabbitmq/_utils.py +++ b/packages/service-library/src/servicelib/rabbitmq/_utils.py @@ -1,12 +1,10 @@ import logging -import random +import os import socket -import string -from pathlib import Path -from tempfile import gettempdir from typing import Any, Final import aio_pika +import psutil from aiormq.exceptions import ChannelPreconditionFailed from pydantic import NonNegativeInt from tenacity import retry @@ -23,12 +21,6 @@ RABBIT_QUEUE_MESSAGE_DEFAULT_TTL_MS: Final[int] = 15 * _MINUTE * 1000 -_PATH_UNIQUE_RABBIT_QUEUE_PREFIX: Final[Path] = ( - Path(gettempdir()) / f"{__name__}_unique_rabbit_queue_prefix" -) -_ALPHABET: Final[str] = string.ascii_letters + string.digits -_CHAR_COUNT: Final[NonNegativeInt] = 6 - class RabbitMQRetryPolicyUponInitialization: """Retry policy upon service initialization""" @@ -60,25 +52,14 @@ async def wait_till_rabbitmq_responsive(url: str) -> bool: return await is_rabbitmq_responsive(url) -def _get_unique_rabbit_queue_name_prefix() -> str: - # NOTE: this prefix is guaranteed to be unique for the entire lifecycle of the docker container +def get_rabbitmq_client_unique_name(base_name: str) -> str: + # NOTE: below prefix is guaranteed to change each time the preocess restarts # Why is this desiarable? # 1. the code base makes the above assumption, otherwise subcscribers and consumers do not work # 2. enables restartability of webserver during [re]deploys - prefix: str | None = None - if _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.exists(): - prefix = _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.read_text() - - if prefix is None: - random_str = "".join(random.choices(_ALPHABET, k=_CHAR_COUNT)) # noqa: S311 - prefix = f"{socket.gethostname()}_{random_str}" - _PATH_UNIQUE_RABBIT_QUEUE_PREFIX.write_text(prefix) + prefix_create_time = f"{psutil.Process(os.getpid()).create_time()}".strip(".")[-6:] - return prefix - - -def get_rabbitmq_client_unique_name(base_name: str) -> str: - return f"{base_name}_{_get_unique_rabbit_queue_name_prefix()}" + return f"{base_name}_{socket.gethostname()}_{prefix_create_time}" async def declare_queue( @@ -90,6 +71,7 @@ async def declare_queue( arguments: dict[str, Any] | None = None, message_ttl: NonNegativeInt = RABBIT_QUEUE_MESSAGE_DEFAULT_TTL_MS, ) -> aio_pika.abc.AbstractRobustQueue: + _ = client_name default_arguments = {"x-message-ttl": message_ttl} if arguments is not None: default_arguments.update(arguments) @@ -97,8 +79,7 @@ async def declare_queue( "durable": True, "exclusive": exclusive_queue, "arguments": default_arguments, - # no names for exclusive queues - # "name": f"{get_rabbitmq_client_unique_name(client_name)}_{exchange_name}_exclusive", + "name": f"{get_rabbitmq_client_unique_name(client_name)}_{exchange_name}_exclusive", } if not exclusive_queue: # NOTE: setting a name will ensure multiple instance will take their data here From 8e2c252b4eab2dd1257c956dfcdcb4e5ce485a67 Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Tue, 17 Sep 2024 14:11:21 +0200 Subject: [PATCH 6/9] revert change --- packages/service-library/src/servicelib/rabbitmq/_utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/service-library/src/servicelib/rabbitmq/_utils.py b/packages/service-library/src/servicelib/rabbitmq/_utils.py index 361888cc3f6..588ab9ecbfa 100644 --- a/packages/service-library/src/servicelib/rabbitmq/_utils.py +++ b/packages/service-library/src/servicelib/rabbitmq/_utils.py @@ -71,7 +71,6 @@ async def declare_queue( arguments: dict[str, Any] | None = None, message_ttl: NonNegativeInt = RABBIT_QUEUE_MESSAGE_DEFAULT_TTL_MS, ) -> aio_pika.abc.AbstractRobustQueue: - _ = client_name default_arguments = {"x-message-ttl": message_ttl} if arguments is not None: default_arguments.update(arguments) From 556649b969ed854ca4832b8fe81d9bdb453fc16a Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Tue, 17 Sep 2024 15:13:29 +0200 Subject: [PATCH 7/9] added missing psutil to servicelib repowisde --- packages/aws-library/requirements/_base.txt | 6 +++- .../service-library/requirements/_base.in | 1 + .../service-library/requirements/_base.txt | 2 ++ .../service-library/requirements/_test.txt | 4 ++- packages/simcore-sdk/requirements/_base.txt | 6 +++- services/api-server/requirements/_base.txt | 9 +++++- services/autoscaling/requirements/_base.txt | 7 ++++- services/autoscaling/requirements/_test.txt | 2 +- services/catalog/requirements/_base.txt | 6 +++- .../clusters-keeper/requirements/_base.txt | 10 +++++-- .../clusters-keeper/requirements/_test.txt | 2 +- services/dask-sidecar/requirements/_base.txt | 8 +++-- .../requirements/_dask-distributed.txt | 2 +- .../datcore-adapter/requirements/_base.txt | 6 +++- services/director-v2/requirements/_base.txt | 6 +++- services/director-v2/requirements/_test.txt | 2 +- services/director/requirements/_base.txt | 12 ++------ services/director/requirements/_tools.txt | 29 +++---------------- .../dynamic-scheduler/requirements/_base.txt | 4 +++ .../dynamic-sidecar/requirements/_base.txt | 12 ++++++-- services/efs-guardian/requirements/_base.txt | 10 ++++++- services/efs-guardian/requirements/_test.txt | 4 ++- services/invitations/requirements/_base.txt | 4 +++ .../requirements/_test.txt | 2 +- .../tests/system/requirements/_test.txt | 2 +- services/payments/requirements/_base.txt | 4 +++ .../requirements/_base.txt | 7 +++++ services/storage/requirements/_base.txt | 10 ++++++- services/web/server/requirements/_base.txt | 6 ++++ tests/swarm-deploy/requirements/_test.txt | 9 +++++- 30 files changed, 134 insertions(+), 60 deletions(-) diff --git a/packages/aws-library/requirements/_base.txt b/packages/aws-library/requirements/_base.txt index 9b654a894e4..1c4e64828a3 100644 --- a/packages/aws-library/requirements/_base.txt +++ b/packages/aws-library/requirements/_base.txt @@ -5,7 +5,9 @@ aioboto3==13.1.1 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.22.2 @@ -174,6 +176,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in pydantic==1.10.17 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/packages/service-library/requirements/_base.in b/packages/service-library/requirements/_base.in index 9de45d3d0af..f31af0b3a40 100644 --- a/packages/service-library/requirements/_base.in +++ b/packages/service-library/requirements/_base.in @@ -19,6 +19,7 @@ opentelemetry-api opentelemetry-exporter-otlp opentelemetry-instrumentation-requests opentelemetry-sdk +psutil pydantic pyinstrument pyyaml diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt index ffa75cad108..4216f1f186d 100644 --- a/packages/service-library/requirements/_base.txt +++ b/packages/service-library/requirements/_base.txt @@ -138,6 +138,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/_base.in pydantic==1.10.17 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt index 0817127e0af..506a21a0c47 100644 --- a/packages/service-library/requirements/_test.txt +++ b/packages/service-library/requirements/_test.txt @@ -142,7 +142,9 @@ pluggy==1.5.0 pprintpp==0.4.0 # via pytest-icdiff psutil==6.0.0 - # via -r requirements/_test.in + # via + # -c requirements/_base.txt + # -r requirements/_test.in py-cpuinfo==9.0.0 # via pytest-benchmark pytest==8.3.2 diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index dd540268ec8..65fcbaa084c 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -1,7 +1,9 @@ aio-pika==9.4.3 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.22.2 @@ -191,6 +193,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 0971eea6abf..ea43eef9e4a 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -3,7 +3,10 @@ aio-pika==9.4.1 # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in + # via + # -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 aiodebug==2.3.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in @@ -365,6 +368,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/autoscaling/requirements/_base.txt b/services/autoscaling/requirements/_base.txt index d41dbd7c0df..4895d0ce00a 100644 --- a/services/autoscaling/requirements/_base.txt +++ b/services/autoscaling/requirements/_base.txt @@ -8,7 +8,9 @@ aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in aiodebug==2.3.0 # via @@ -57,6 +59,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -344,9 +347,11 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # distributed pydantic==1.10.15 # via diff --git a/services/autoscaling/requirements/_test.txt b/services/autoscaling/requirements/_test.txt index 0ea92cb9a42..8f2bda059cd 100644 --- a/services/autoscaling/requirements/_test.txt +++ b/services/autoscaling/requirements/_test.txt @@ -173,7 +173,7 @@ ply==3.11 # via jsonpath-ng pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/_base.txt # -r requirements/_test.in diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index ffc4ea41fb3..f69139967eb 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -1,7 +1,9 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -257,6 +259,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pydantic==1.10.14 diff --git a/services/clusters-keeper/requirements/_base.txt b/services/clusters-keeper/requirements/_base.txt index 61454bc6491..9adaa406642 100644 --- a/services/clusters-keeper/requirements/_base.txt +++ b/services/clusters-keeper/requirements/_base.txt @@ -7,7 +7,10 @@ aioboto3==13.1.0 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/../../../packages/aws-library/requirements/_base.in + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in @@ -54,6 +57,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -341,9 +345,11 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # distributed pydantic==1.10.15 # via diff --git a/services/clusters-keeper/requirements/_test.txt b/services/clusters-keeper/requirements/_test.txt index c0ae277a70c..4dea10f742d 100644 --- a/services/clusters-keeper/requirements/_test.txt +++ b/services/clusters-keeper/requirements/_test.txt @@ -193,7 +193,7 @@ pluggy==1.5.0 # via pytest ply==3.11 # via jsonpath-ng -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/_base.txt # -r requirements/_test.in diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt index f244baa1cfe..a04b02047b3 100644 --- a/services/dask-sidecar/requirements/_base.txt +++ b/services/dask-sidecar/requirements/_base.txt @@ -2,6 +2,8 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in aiobotocore==2.13.0 # via s3fs +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -251,8 +253,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 - # via distributed +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # distributed pydantic==1.10.15 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/services/dask-sidecar/requirements/_dask-distributed.txt b/services/dask-sidecar/requirements/_dask-distributed.txt index b4ff09e8003..e9ebbb2a0f5 100644 --- a/services/dask-sidecar/requirements/_dask-distributed.txt +++ b/services/dask-sidecar/requirements/_dask-distributed.txt @@ -63,7 +63,7 @@ partd==1.4.2 # via # -c requirements/./_base.txt # dask -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/./_base.txt # distributed diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt index b5ebf65f34c..d1ed690f390 100644 --- a/services/datcore-adapter/requirements/_base.txt +++ b/services/datcore-adapter/requirements/_base.txt @@ -1,7 +1,9 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -229,6 +231,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in pydantic==1.10.14 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index c6d20f8910b..500eb0159de 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -5,6 +5,8 @@ aio-pika==9.4.1 # -r requirements/_base.in aiocache==0.12.2 # via + # -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 aiodebug==2.3.0 @@ -430,8 +432,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 +psutil==6.0.0 # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed psycopg2-binary==2.9.9 diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index 3e854eaddaa..a344bc67885 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -215,7 +215,7 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/_base.txt # distributed diff --git a/services/director/requirements/_base.txt b/services/director/requirements/_base.txt index d8280bd4673..2c6e016526f 100644 --- a/services/director/requirements/_base.txt +++ b/services/director/requirements/_base.txt @@ -1,9 +1,3 @@ -# -# This file is autogenerated by pip-compile with python 3.6 -# To update, run: -# -# pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in -# aiodebug==1.1.2 # via # -r requirements/_base.in @@ -54,9 +48,7 @@ chardet==3.0.4 charset-normalizer==2.0.12 # via requests dataclasses==0.7 - # via - # -r requirements/_base.in - # pydantic + # via -r requirements/_base.in idna==2.8 # via # -r requirements/_base.in @@ -116,7 +108,7 @@ pyyaml==5.4 # simcore-service-library requests==2.27.1 # via -r requirements/_base.in -simcore-service-library @ git+https://github.com/ITISFoundation/osparc-simcore.git@c8669fb52659b684514fefa4f3b4599f57f276a0#subdirectory=packages/service-library +simcore-service-library @ 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 diff --git a/services/director/requirements/_tools.txt b/services/director/requirements/_tools.txt index 38ed7220aed..4c0c50f666d 100644 --- a/services/director/requirements/_tools.txt +++ b/services/director/requirements/_tools.txt @@ -1,9 +1,3 @@ -# -# This file is autogenerated by pip-compile with python 3.6 -# To update, run: -# -# pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in -# appdirs==1.4.4 # via black black==20.8b1 @@ -14,22 +8,14 @@ click==8.0.3 # via # black # pip-tools -dataclasses==0.7 - # via - # -c requirements/_base.txt - # -c requirements/_test.txt - # black -importlib-metadata==2.0.0 - # via - # -c requirements/_test.txt - # click - # pep517 mypy-extensions==0.4.3 # via black pathspec==0.9.0 # via black pep517==0.12.0 # via pip-tools +pip==24.2 + # via pip-tools pip-tools==6.4.0 # via -r requirements/_tools.in pyyaml==5.4 @@ -39,6 +25,8 @@ pyyaml==5.4 # watchdog regex==2022.1.18 # via black +setuptools==75.1.0 + # via pip-tools toml==0.10.2 # via # -c requirements/_test.txt @@ -55,12 +43,3 @@ watchdog==2.1.6 # via -r requirements/_tools.in wheel==0.37.1 # via pip-tools -zipp==3.4.0 - # via - # -c requirements/_test.txt - # importlib-metadata - # pep517 - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/services/dynamic-scheduler/requirements/_base.txt b/services/dynamic-scheduler/requirements/_base.txt index 6b8b5400a04..bab6a9c099e 100644 --- a/services/dynamic-scheduler/requirements/_base.txt +++ b/services/dynamic-scheduler/requirements/_base.txt @@ -1,5 +1,7 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -233,6 +235,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pydantic==1.10.15 diff --git a/services/dynamic-sidecar/requirements/_base.txt b/services/dynamic-sidecar/requirements/_base.txt index 8931eb864de..9cdc66a8256 100644 --- a/services/dynamic-sidecar/requirements/_base.txt +++ b/services/dynamic-sidecar/requirements/_base.txt @@ -4,7 +4,10 @@ aio-pika==9.4.1 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in aiocache==0.12.2 - # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in + # via + # -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 aiodebug==2.3.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in @@ -316,8 +319,11 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 - # via -r requirements/_base.in +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/efs-guardian/requirements/_base.txt b/services/efs-guardian/requirements/_base.txt index e7733a1c0ae..6d67dee0772 100644 --- a/services/efs-guardian/requirements/_base.txt +++ b/services/efs-guardian/requirements/_base.txt @@ -7,7 +7,10 @@ aioboto3==13.1.0 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/../../../packages/aws-library/requirements/_base.in + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in @@ -54,6 +57,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -280,6 +284,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in pydantic==1.10.15 # via # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/services/efs-guardian/requirements/_test.txt b/services/efs-guardian/requirements/_test.txt index 19db2db14aa..f35b36a175a 100644 --- a/services/efs-guardian/requirements/_test.txt +++ b/services/efs-guardian/requirements/_test.txt @@ -192,7 +192,9 @@ pluggy==1.5.0 ply==3.11 # via jsonpath-ng psutil==6.0.0 - # via -r requirements/_test.in + # via + # -c requirements/_base.txt + # -r requirements/_test.in py-partiql-parser==0.5.5 # via moto pycparser==2.22 diff --git a/services/invitations/requirements/_base.txt b/services/invitations/requirements/_base.txt index b937284d30e..590de2833e0 100644 --- a/services/invitations/requirements/_base.txt +++ b/services/invitations/requirements/_base.txt @@ -1,5 +1,7 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -218,6 +220,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in pycparser==2.21 # via cffi pydantic==1.10.14 diff --git a/services/osparc-gateway-server/requirements/_test.txt b/services/osparc-gateway-server/requirements/_test.txt index 6e5c4d5dba7..a092c888f38 100644 --- a/services/osparc-gateway-server/requirements/_test.txt +++ b/services/osparc-gateway-server/requirements/_test.txt @@ -117,7 +117,7 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../dask-sidecar/requirements/_dask-distributed.txt # distributed diff --git a/services/osparc-gateway-server/tests/system/requirements/_test.txt b/services/osparc-gateway-server/tests/system/requirements/_test.txt index c16ee0a03f1..f2a90715442 100644 --- a/services/osparc-gateway-server/tests/system/requirements/_test.txt +++ b/services/osparc-gateway-server/tests/system/requirements/_test.txt @@ -110,7 +110,7 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../../../dask-sidecar/requirements/_dask-distributed.txt # distributed diff --git a/services/payments/requirements/_base.txt b/services/payments/requirements/_base.txt index 7e8274bea6c..e8c6dd841e1 100644 --- a/services/payments/requirements/_base.txt +++ b/services/payments/requirements/_base.txt @@ -1,5 +1,7 @@ aio-pika==9.4.2 # via -r requirements/../../../packages/service-library/requirements/_base.in +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.22.2 @@ -266,6 +268,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pyasn1==0.6.0 diff --git a/services/resource-usage-tracker/requirements/_base.txt b/services/resource-usage-tracker/requirements/_base.txt index bbf9e2ff722..75e0ca71ed2 100644 --- a/services/resource-usage-tracker/requirements/_base.txt +++ b/services/resource-usage-tracker/requirements/_base.txt @@ -8,7 +8,9 @@ aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in aiodebug==2.3.0 # via @@ -60,6 +62,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -344,6 +347,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pydantic==1.10.14 diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index 16b7395e592..f65c39f7b71 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -9,7 +9,10 @@ aioboto3==13.1.0 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/../../../packages/aws-library/requirements/_base.in + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in @@ -67,6 +70,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -329,6 +333,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index 352ae52b9ec..770ea9b9d9e 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -5,6 +5,8 @@ aio-pika==9.1.2 # -r requirements/_base.in aiocache==0.11.1 # via + # -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 aiodebug==2.3.0 @@ -373,6 +375,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.6 # via # aiopg diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt index 8b474b1fee9..22c0768cda4 100644 --- a/tests/swarm-deploy/requirements/_test.txt +++ b/tests/swarm-deploy/requirements/_test.txt @@ -4,7 +4,10 @@ aio-pika==9.4.3 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_test.in aiocache==0.12.2 - # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in + # via + # -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 aiodebug==2.3.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in @@ -266,6 +269,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg From fc927c4e1afb192ce2150579d6dd5047dc45debe Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Tue, 17 Sep 2024 15:15:23 +0200 Subject: [PATCH 8/9] revert directro changes --- services/director/requirements/_base.txt | 12 ++++++++-- services/director/requirements/_tools.txt | 29 +++++++++++++++++++---- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/services/director/requirements/_base.txt b/services/director/requirements/_base.txt index 2c6e016526f..d8280bd4673 100644 --- a/services/director/requirements/_base.txt +++ b/services/director/requirements/_base.txt @@ -1,3 +1,9 @@ +# +# This file is autogenerated by pip-compile with python 3.6 +# To update, run: +# +# pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in +# aiodebug==1.1.2 # via # -r requirements/_base.in @@ -48,7 +54,9 @@ chardet==3.0.4 charset-normalizer==2.0.12 # via requests dataclasses==0.7 - # via -r requirements/_base.in + # via + # -r requirements/_base.in + # pydantic idna==2.8 # via # -r requirements/_base.in @@ -108,7 +116,7 @@ pyyaml==5.4 # simcore-service-library requests==2.27.1 # via -r requirements/_base.in -simcore-service-library @ git+https://github.com/ITISFoundation/osparc-simcore.git@c8669fb52659b684514fefa4f3b4599f57f276a0#egg=simcore-service-library&subdirectory=packages/service-library +simcore-service-library @ git+https://github.com/ITISFoundation/osparc-simcore.git@c8669fb52659b684514fefa4f3b4599f57f276a0#subdirectory=packages/service-library # via -r requirements/_base.in six==1.12.0 # via diff --git a/services/director/requirements/_tools.txt b/services/director/requirements/_tools.txt index 4c0c50f666d..38ed7220aed 100644 --- a/services/director/requirements/_tools.txt +++ b/services/director/requirements/_tools.txt @@ -1,3 +1,9 @@ +# +# This file is autogenerated by pip-compile with python 3.6 +# To update, run: +# +# pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in +# appdirs==1.4.4 # via black black==20.8b1 @@ -8,14 +14,22 @@ click==8.0.3 # via # black # pip-tools +dataclasses==0.7 + # via + # -c requirements/_base.txt + # -c requirements/_test.txt + # black +importlib-metadata==2.0.0 + # via + # -c requirements/_test.txt + # click + # pep517 mypy-extensions==0.4.3 # via black pathspec==0.9.0 # via black pep517==0.12.0 # via pip-tools -pip==24.2 - # via pip-tools pip-tools==6.4.0 # via -r requirements/_tools.in pyyaml==5.4 @@ -25,8 +39,6 @@ pyyaml==5.4 # watchdog regex==2022.1.18 # via black -setuptools==75.1.0 - # via pip-tools toml==0.10.2 # via # -c requirements/_test.txt @@ -43,3 +55,12 @@ watchdog==2.1.6 # via -r requirements/_tools.in wheel==0.37.1 # via pip-tools +zipp==3.4.0 + # via + # -c requirements/_test.txt + # importlib-metadata + # pep517 + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools From 9eb11110a66d4928463383b0c674b88838f4bdda Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Tue, 17 Sep 2024 16:06:10 +0200 Subject: [PATCH 9/9] fixed missing types --- packages/service-library/requirements/_test.in | 4 ++-- packages/service-library/requirements/_test.txt | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/service-library/requirements/_test.in b/packages/service-library/requirements/_test.in index 5f85f1ff4d6..3ce22356810 100644 --- a/packages/service-library/requirements/_test.in +++ b/packages/service-library/requirements/_test.in @@ -18,7 +18,6 @@ docker faker flaky openapi-spec-validator -psutil pytest pytest-aiohttp pytest-asyncio @@ -35,5 +34,6 @@ python-dotenv respx sqlalchemy[mypy] types_aiofiles -types-psycopg2 types_tqdm +types-psutil +types-psycopg2 diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt index 506a21a0c47..42d1479b5d2 100644 --- a/packages/service-library/requirements/_test.txt +++ b/packages/service-library/requirements/_test.txt @@ -141,10 +141,6 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==6.0.0 - # via - # -c requirements/_base.txt - # -r requirements/_test.in py-cpuinfo==9.0.0 # via pytest-benchmark pytest==8.3.2 @@ -246,6 +242,8 @@ termcolor==2.4.0 # via pytest-sugar types-aiofiles==24.1.0.20240626 # via -r requirements/_test.in +types-psutil==6.0.0.20240901 + # via -r requirements/_test.in types-psycopg2==2.9.21.20240819 # via -r requirements/_test.in types-tqdm==4.66.0.20240417