diff --git a/.github/workflows/ci-arm-build.yml b/.github/workflows/ci-arm-build.yml
index fcced45470a..1cc89874b06 100644
--- a/.github/workflows/ci-arm-build.yml
+++ b/.github/workflows/ci-arm-build.yml
@@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
python: ["3.11"]
env:
# secrets can be set in settings/secrets on github
diff --git a/.github/workflows/ci-multi-architecture-fusing.yml b/.github/workflows/ci-multi-architecture-fusing.yml
index bd825b0d247..dadeedf1038 100644
--- a/.github/workflows/ci-multi-architecture-fusing.yml
+++ b/.github/workflows/ci-multi-architecture-fusing.yml
@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
python: ["3.11"]
env:
# secrets can be set in settings/secrets on github
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index 95a410245a3..6963b3a28c1 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
env:
TO_TAG_PREFIX: release-github
diff --git a/.github/workflows/ci-staging.yml b/.github/workflows/ci-staging.yml
index 1fd08e48593..dbef04653aa 100644
--- a/.github/workflows/ci-staging.yml
+++ b/.github/workflows/ci-staging.yml
@@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
env:
TO_TAG_PREFIX: staging-github
diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml
index a1778e11092..857601cfb93 100644
--- a/.github/workflows/ci-testing-deploy.yml
+++ b/.github/workflows/ci-testing-deploy.yml
@@ -274,7 +274,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
name: "[build] docker images (excluding frontend)"
steps:
@@ -309,7 +309,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
name: "[build] docker images (frontend-only)"
steps:
@@ -343,7 +343,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -391,7 +391,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -433,7 +433,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -475,7 +475,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -520,7 +520,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -565,7 +565,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -612,7 +612,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -654,7 +654,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -702,7 +702,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -747,7 +747,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -798,7 +798,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -854,7 +854,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -905,7 +905,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -956,7 +956,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1007,7 +1007,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1052,7 +1052,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1097,7 +1097,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1142,7 +1142,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1187,7 +1187,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1232,7 +1232,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1287,7 +1287,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1332,7 +1332,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1388,7 +1388,7 @@ jobs:
strategy:
matrix:
python: ["3.11", "3.12"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1423,7 +1423,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1468,7 +1468,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1513,7 +1513,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1558,7 +1558,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1603,7 +1603,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1648,7 +1648,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1692,7 +1692,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1733,7 +1733,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1778,7 +1778,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1874,7 +1874,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -1936,7 +1936,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2000,7 +2000,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2064,7 +2064,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
env:
# NOTE: DIRECTOR_DEFAULT_MAX_* used for integration-tests that include `director` service
@@ -2137,7 +2137,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2204,7 +2204,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2268,7 +2268,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2356,7 +2356,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2416,7 +2416,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2482,7 +2482,7 @@ jobs:
matrix:
python: ["3.11"]
node: [14]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2564,7 +2564,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2626,7 +2626,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
steps:
- uses: actions/checkout@v4
@@ -2685,7 +2685,7 @@ jobs:
strategy:
matrix:
python: ["3.11"]
- os: [ubuntu-22.04]
+ os: [ubuntu-24.04]
fail-fast: false
env:
# secrets can be set in settings/secrets on github
diff --git a/Makefile b/Makefile
index 71d81fba569..af831365f8e 100644
--- a/Makefile
+++ b/Makefile
@@ -663,6 +663,8 @@ local-registry: .env ## creates a local docker registry and configure simcore to
echo configuring host file to redirect $(LOCAL_REGISTRY_HOSTNAME) to 127.0.0.1; \
sudo echo 127.0.0.1 $(LOCAL_REGISTRY_HOSTNAME) | sudo tee -a /etc/hosts;\
echo done)
+ @$(if $(shell test -f /etc/docker/daemon.json),, \
+ sudo touch /etc/docker/daemon.json)
@$(if $(shell jq -e '.["insecure-registries"]? | index("http://$(LOCAL_REGISTRY_HOSTNAME):5000")? // empty' /etc/docker/daemon.json),,\
echo configuring docker engine to use insecure local registry...; \
jq 'if .["insecure-registries"] | index("http://$(LOCAL_REGISTRY_HOSTNAME):5000") then . else .["insecure-registries"] += ["http://$(LOCAL_REGISTRY_HOSTNAME):5000"] end' /etc/docker/daemon.json > /tmp/daemon.json &&\
diff --git a/ci/github/unit-testing/storage.bash b/ci/github/unit-testing/storage.bash
index 34b2a358ebe..3295e4d6895 100755
--- a/ci/github/unit-testing/storage.bash
+++ b/ci/github/unit-testing/storage.bash
@@ -19,7 +19,7 @@ test() {
# shellcheck source=/dev/null
source .venv/bin/activate
pushd services/storage
- make test-ci-unit
+ make test-ci-unit pytest-parameters="--disk-usage"
popd
}
diff --git a/packages/aws-library/requirements/_test.txt b/packages/aws-library/requirements/_test.txt
index c1f3d88d5ff..e5c4d651dfc 100644
--- a/packages/aws-library/requirements/_test.txt
+++ b/packages/aws-library/requirements/_test.txt
@@ -117,8 +117,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -144,10 +142,8 @@ markupsafe==3.0.2
# via
# jinja2
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
networkx==3.4.2
@@ -175,7 +171,7 @@ pprintpp==0.4.0
# via pytest-icdiff
py-cpuinfo==9.0.0
# via pytest-benchmark
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -234,7 +230,6 @@ pyyaml==6.0.2
# -c requirements/_base.txt
# -r requirements/_test.in
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/packages/aws-library/tests/test_ec2_client.py b/packages/aws-library/tests/test_ec2_client.py
index af773d5851c..a1cbdf55c57 100644
--- a/packages/aws-library/tests/test_ec2_client.py
+++ b/packages/aws-library/tests/test_ec2_client.py
@@ -52,8 +52,7 @@ async def simcore_ec2_api(
await ec2.close()
-async def test_ec2_client_lifespan(simcore_ec2_api: SimcoreEC2API):
- ...
+async def test_ec2_client_lifespan(simcore_ec2_api: SimcoreEC2API): ...
async def test_aiobotocore_ec2_client_when_ec2_server_goes_up_and_down(
@@ -107,12 +106,12 @@ async def test_get_ec2_instance_capabilities(
simcore_ec2_api: SimcoreEC2API,
ec2_allowed_instances: list[InstanceTypeType],
):
- instance_types: list[
- EC2InstanceType
- ] = await simcore_ec2_api.get_ec2_instance_capabilities(
- cast(
- set[InstanceTypeType],
- set(ec2_allowed_instances),
+ instance_types: list[EC2InstanceType] = (
+ await simcore_ec2_api.get_ec2_instance_capabilities(
+ cast(
+ set[InstanceTypeType],
+ set(ec2_allowed_instances),
+ )
)
)
assert instance_types
@@ -125,7 +124,9 @@ async def test_get_ec2_instance_capabilities_returns_all_options(
instance_types = await simcore_ec2_api.get_ec2_instance_capabilities("ALL")
assert instance_types
# NOTE: this might need adaptation when moto is updated
- assert 700 < len(instance_types) < 852
+ assert (
+ 850 < len(instance_types) < 877
+ ), f"received {len(instance_types)}, the test might need adaptation"
async def test_get_ec2_instance_capabilities_raise_with_empty_set(
@@ -151,9 +152,9 @@ async def fake_ec2_instance_type(
request: pytest.FixtureRequest,
) -> EC2InstanceType:
instance_type_name: InstanceTypeType = request.param
- instance_types: list[
- EC2InstanceType
- ] = await simcore_ec2_api.get_ec2_instance_capabilities({instance_type_name})
+ instance_types: list[EC2InstanceType] = (
+ await simcore_ec2_api.get_ec2_instance_capabilities({instance_type_name})
+ )
assert len(instance_types) == 1
return instance_types[0]
diff --git a/packages/aws-library/tests/test_s3_client.py b/packages/aws-library/tests/test_s3_client.py
index e239861696d..4380827b2fb 100644
--- a/packages/aws-library/tests/test_s3_client.py
+++ b/packages/aws-library/tests/test_s3_client.py
@@ -1133,14 +1133,13 @@ async def test_create_multipart_presigned_upload_link(
assert s3_metadata.last_modified
assert s3_metadata.e_tag == f"{json.loads(received_e_tag)}"
- # completing again raises
- with pytest.raises(S3UploadNotFoundError):
- await simcore_s3_api.complete_multipart_upload(
- bucket=with_s3_bucket,
- object_key=file_id,
- upload_id=upload_links.upload_id,
- uploaded_parts=uploaded_parts,
- )
+ # completing again does not raise anymore (was raising until moto==5.0.21)
+ await simcore_s3_api.complete_multipart_upload(
+ bucket=with_s3_bucket,
+ object_key=file_id,
+ upload_id=upload_links.upload_id,
+ uploaded_parts=uploaded_parts,
+ )
@pytest.mark.parametrize(
diff --git a/packages/pytest-simcore/src/pytest_simcore/disk_usage_monitoring.py b/packages/pytest-simcore/src/pytest_simcore/disk_usage_monitoring.py
index 37ab7de0a0d..c4ebece8cb6 100644
--- a/packages/pytest-simcore/src/pytest_simcore/disk_usage_monitoring.py
+++ b/packages/pytest-simcore/src/pytest_simcore/disk_usage_monitoring.py
@@ -7,7 +7,7 @@
_DEFAULT_THREADHOLD_MB = 512
-def pytest_addoption(parser):
+def pytest_addoption(parser: pytest.Parser):
simcore_group = parser.getgroup("simcore")
simcore_group.addoption(
"--disk-usage", action="store_true", help="Enable disk usage monitoring"
diff --git a/packages/pytest-simcore/src/pytest_simcore/file_extra.py b/packages/pytest-simcore/src/pytest_simcore/file_extra.py
index a761a571c2d..b50e96d8f6c 100644
--- a/packages/pytest-simcore/src/pytest_simcore/file_extra.py
+++ b/packages/pytest-simcore/src/pytest_simcore/file_extra.py
@@ -1,12 +1,12 @@
import logging
-from collections.abc import Callable
+from collections.abc import Callable, Iterable, Iterator
from pathlib import Path
-from typing import Iterable
import pytest
from faker import Faker
from pydantic import ByteSize, NonNegativeInt
-from pytest_simcore.helpers.logging_tools import log_context
+
+from .helpers.logging_tools import log_context
@pytest.fixture
@@ -21,8 +21,11 @@ def fake_file_name(tmp_path: Path, faker: Faker) -> Iterable[Path]:
@pytest.fixture
-def create_file_of_size(tmp_path: Path, faker: Faker) -> Callable[[ByteSize], Path]:
- # NOTE: cleanup is done by tmp_path fixture
+def create_file_of_size(
+ tmp_path: Path, faker: Faker
+) -> Iterator[Callable[[ByteSize], Path]]:
+ created_files = []
+
def _creator(size: ByteSize, name: str | None = None) -> Path:
file: Path = tmp_path / (name or faker.file_name())
if not file.parent.exists():
@@ -33,9 +36,15 @@ def _creator(size: ByteSize, name: str | None = None) -> Path:
assert file.exists()
assert file.stat().st_size == size
+ created_files.append(file)
return file
- return _creator
+ yield _creator
+
+ for file in created_files:
+ if file.exists():
+ file.unlink()
+ assert not file.exists()
def _create_random_content(
diff --git a/packages/simcore-sdk/requirements/_test.txt b/packages/simcore-sdk/requirements/_test.txt
index 7f4536f84c6..f17742ef99a 100644
--- a/packages/simcore-sdk/requirements/_test.txt
+++ b/packages/simcore-sdk/requirements/_test.txt
@@ -137,8 +137,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -171,10 +169,8 @@ markupsafe==3.0.2
# jinja2
# mako
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
multidict==6.1.0
@@ -211,7 +207,7 @@ propcache==0.3.0
# -c requirements/_base.txt
# aiohttp
# yarl
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -268,7 +264,6 @@ pyyaml==6.0.2
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index a3baae828c6..d41bc183c30 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -72,10 +72,6 @@ pytest-lazy-fixture>=999999999
# avoid downgrades of openapi-spec-validator related libraries
referencing<=0.35.1
-# moto==5.0.21 broke `get_ec2_instance_capabilities`
-# SEE https://github.com/ITISFoundation/osparc-simcore/issues/7086
-moto<5.0.21
-
# Pin boto3<1.36.0 till the following is addressed https://github.com/boto/botocore/issues/2308
# when removing this pin, also update the aws cli inside ci/github/helpers/install_aws_cli_v2.bash
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/7127
diff --git a/services/agent/requirements/_test.txt b/services/agent/requirements/_test.txt
index fbb22e5e1d4..f31d57f0582 100644
--- a/services/agent/requirements/_test.txt
+++ b/services/agent/requirements/_test.txt
@@ -138,8 +138,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -165,10 +163,8 @@ markupsafe==3.0.2
# via
# jinja2
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
multidict==6.1.0
@@ -197,7 +193,7 @@ propcache==0.3.0
# -c requirements/_base.txt
# aiohttp
# yarl
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -242,7 +238,6 @@ pyyaml==6.0.2
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt
index 59d1e3d5f64..3df605fe67f 100644
--- a/services/api-server/requirements/_base.txt
+++ b/services/api-server/requirements/_base.txt
@@ -619,6 +619,34 @@ pydantic-extra-types==2.10.0
# fastapi
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/postgres-database/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../packages/common-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/../../../packages/common-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/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/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/../../../packages/common-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/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt
index 15f1bdaa303..e4a95cfd8ec 100644
--- a/services/api-server/requirements/_test.txt
+++ b/services/api-server/requirements/_test.txt
@@ -196,7 +196,6 @@ markupsafe==3.0.2
# moto
moto==4.0.1
# via
- # -c requirements/../../../requirements/constraints.txt
# -c requirements/./constraints.txt
# -r requirements/_test.in
multidict==6.1.0
@@ -236,7 +235,7 @@ psutil==6.1.0
# via
# -c requirements/_base.txt
# pact-python
-pyasn1==0.6.1
+pyasn1==0.4.8
# via
# python-jose
# rsa
@@ -368,7 +367,6 @@ typing-extensions==4.12.2
# -c requirements/_base.txt
# alembic
# anyio
- # faker
# fastapi
# mypy
# pydantic
diff --git a/services/autoscaling/requirements/_base.txt b/services/autoscaling/requirements/_base.txt
index e6d9bfc6ca5..bffe841d719 100644
--- a/services/autoscaling/requirements/_base.txt
+++ b/services/autoscaling/requirements/_base.txt
@@ -556,6 +556,30 @@ pydantic-extra-types==2.10.0
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../requirements/constraints.txt
# -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/../../../packages/settings-library/requirements/_base.in
diff --git a/services/autoscaling/requirements/_test.txt b/services/autoscaling/requirements/_test.txt
index 4aebd863041..bffd28ffda7 100644
--- a/services/autoscaling/requirements/_test.txt
+++ b/services/autoscaling/requirements/_test.txt
@@ -125,8 +125,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -155,10 +153,8 @@ markupsafe==3.0.2
# -c requirements/_base.txt
# jinja2
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
networkx==3.4.2
@@ -186,7 +182,7 @@ psutil==6.1.0
# via
# -c requirements/_base.txt
# -r requirements/_test.in
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -237,7 +233,6 @@ pyyaml==6.0.2
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/services/autoscaling/tests/unit/conftest.py b/services/autoscaling/tests/unit/conftest.py
index 4ae3f0ccd13..9f82282ad11 100644
--- a/services/autoscaling/tests/unit/conftest.py
+++ b/services/autoscaling/tests/unit/conftest.py
@@ -38,7 +38,9 @@
DockerLabelKey,
StandardSimcoreDockerLabels,
)
-from models_library.generated_models.docker_rest_api import Availability
+from models_library.generated_models.docker_rest_api import (
+ Availability,
+)
from models_library.generated_models.docker_rest_api import Node as DockerNode
from models_library.generated_models.docker_rest_api import (
NodeDescription,
@@ -757,7 +759,7 @@ async def _() -> None:
), f"service {found_service['Spec']['Name']}'s task is {service_task['Status']['State']}"
ctx.logger.info(
"%s",
- f"service {found_service['Spec']['Name']} is now {service_task['Status']['State']} {'.'*number_of_success['count']}",
+ f"service {found_service['Spec']['Name']} is now {service_task['Status']['State']} {'.' * number_of_success['count']}",
)
number_of_success["count"] += 1
assert (number_of_success["count"] * WAIT_TIME) >= SUCCESS_STABLE_TIME_S
@@ -774,7 +776,6 @@ def aws_allowed_ec2_instance_type_names() -> list[InstanceTypeType]:
return [
"t2.xlarge",
"t2.2xlarge",
- "g3.4xlarge",
"g4dn.2xlarge",
"g4dn.8xlarge",
"r5n.4xlarge",
diff --git a/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py b/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py
index bad4215a65e..207296dc1b5 100644
--- a/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py
+++ b/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py
@@ -85,8 +85,7 @@ def minimal_configuration(
disable_dynamic_service_background_task: None,
disable_buffers_pool_background_task: None,
mocked_redis_server: None,
-) -> None:
- ...
+) -> None: ...
@pytest.fixture
@@ -582,11 +581,11 @@ async def test_cluster_scaling_up_and_down( # noqa: PLR0915
available=with_drain_nodes_labelled,
)
# update our fake node
- fake_attached_node.spec.labels[
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ] = mock_docker_tag_node.call_args_list[0][1]["tags"][
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ]
+ fake_attached_node.spec.labels[_OSPARC_SERVICES_READY_DATETIME_LABEL_KEY] = (
+ mock_docker_tag_node.call_args_list[0][1]["tags"][
+ _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
+ ]
+ )
# check the activate time is later than attach time
assert arrow.get(
mock_docker_tag_node.call_args_list[1][1]["tags"][
@@ -611,11 +610,11 @@ async def test_cluster_scaling_up_and_down( # noqa: PLR0915
available=True,
)
# update our fake node
- fake_attached_node.spec.labels[
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ] = mock_docker_tag_node.call_args_list[1][1]["tags"][
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ]
+ fake_attached_node.spec.labels[_OSPARC_SERVICES_READY_DATETIME_LABEL_KEY] = (
+ mock_docker_tag_node.call_args_list[1][1]["tags"][
+ _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
+ ]
+ )
mock_docker_tag_node.reset_mock()
mock_docker_set_node_availability.assert_not_called()
mock_rabbitmq_post_message.assert_called_once()
@@ -756,9 +755,9 @@ async def test_cluster_scaling_up_and_down( # noqa: PLR0915
# we artifically set the node to drain
fake_attached_node.spec.availability = Availability.drain
fake_attached_node.spec.labels[_OSPARC_SERVICE_READY_LABEL_KEY] = "false"
- fake_attached_node.spec.labels[
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ] = datetime.datetime.now(tz=datetime.UTC).isoformat()
+ fake_attached_node.spec.labels[_OSPARC_SERVICES_READY_DATETIME_LABEL_KEY] = (
+ datetime.datetime.now(tz=datetime.UTC).isoformat()
+ )
# the node will be not be terminated before the timeout triggers
assert app_settings.AUTOSCALING_EC2_INSTANCES
@@ -960,7 +959,7 @@ async def test_cluster_does_not_scale_up_if_defined_instance_is_not_fitting_reso
cpus=5, ram=TypeAdapter(ByteSize).validate_python("36Gib")
),
num_tasks=10,
- expected_instance_type="g3.4xlarge",
+ expected_instance_type="r5n.4xlarge", # 32 cpus, 128Gib
expected_num_instances=4,
),
id="isolve",
@@ -1429,12 +1428,12 @@ async def test_long_pending_ec2_is_detected_as_broken_terminated_and_restarted(
[
pytest.param(
_ScaleUpParams(
- imposed_instance_type="g3.4xlarge", # 1 GPU, 16 CPUs, 122GiB
+ imposed_instance_type="g4dn.2xlarge", # 1 GPU, 8 CPUs, 32GiB
task_resources=Resources(
- cpus=16, ram=TypeAdapter(ByteSize).validate_python("30Gib")
+ cpus=8, ram=TypeAdapter(ByteSize).validate_python("15Gib")
),
num_tasks=12,
- expected_instance_type="g3.4xlarge", # 1 GPU, 16 CPUs, 122GiB
+ expected_instance_type="g4dn.2xlarge", # 1 GPU, 8 CPUs, 32GiB
expected_num_instances=10,
),
_ScaleUpParams(
@@ -1446,7 +1445,7 @@ async def test_long_pending_ec2_is_detected_as_broken_terminated_and_restarted(
expected_instance_type="g4dn.8xlarge", # 32CPUs, 128GiB
expected_num_instances=7,
),
- id="A batch of services requiring g3.4xlarge and a batch requiring g4dn.8xlarge",
+ id="A batch of services requiring g4dn.2xlarge and a batch requiring g4dn.8xlarge",
),
],
)
diff --git a/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py b/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py
index 6bb3a865bbe..6cae25e72ff 100644
--- a/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py
+++ b/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py
@@ -204,8 +204,7 @@ def minimal_configuration(
disable_dynamic_service_background_task: None,
disable_buffers_pool_background_task: None,
mocked_redis_server: None,
-) -> None:
- ...
+) -> None: ...
def _assert_rabbit_autoscaling_message_sent(
@@ -626,11 +625,11 @@ async def _assert_wait_for_ec2_instances_running() -> list[InstanceTypeDef]:
)
# update our fake node
fake_attached_node.spec.labels[_OSPARC_SERVICE_READY_LABEL_KEY] = "true"
- fake_attached_node.spec.labels[
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ] = mock_docker_tag_node.call_args_list[2][1]["tags"][
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ]
+ fake_attached_node.spec.labels[_OSPARC_SERVICES_READY_DATETIME_LABEL_KEY] = (
+ mock_docker_tag_node.call_args_list[2][1]["tags"][
+ _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
+ ]
+ )
# check the activate time is later than attach time
assert arrow.get(
mock_docker_tag_node.call_args_list[1][1]["tags"][
@@ -661,11 +660,11 @@ async def _assert_wait_for_ec2_instances_running() -> list[InstanceTypeDef]:
available=True,
)
# update our fake node
- fake_attached_node.spec.labels[
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ] = mock_docker_tag_node.call_args_list[1][1]["tags"][
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ]
+ fake_attached_node.spec.labels[_OSPARC_SERVICES_READY_DATETIME_LABEL_KEY] = (
+ mock_docker_tag_node.call_args_list[1][1]["tags"][
+ _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
+ ]
+ )
mock_docker_tag_node.reset_mock()
mock_docker_set_node_availability.assert_not_called()
@@ -852,9 +851,9 @@ async def _assert_wait_for_ec2_instances_running() -> list[InstanceTypeDef]:
if not with_drain_nodes_labelled:
fake_attached_node.spec.availability = Availability.drain
fake_attached_node.spec.labels[_OSPARC_SERVICE_READY_LABEL_KEY] = "false"
- fake_attached_node.spec.labels[
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ] = datetime.datetime.now(tz=datetime.UTC).isoformat()
+ fake_attached_node.spec.labels[_OSPARC_SERVICES_READY_DATETIME_LABEL_KEY] = (
+ datetime.datetime.now(tz=datetime.UTC).isoformat()
+ )
# the node will not be terminated before the timeout triggers
assert app_settings.AUTOSCALING_EC2_INSTANCES
@@ -1150,7 +1149,7 @@ async def test_cluster_scaling_up_and_down_against_aws(
cpus=5, ram=TypeAdapter(ByteSize).validate_python("36Gib")
),
num_services=10,
- expected_instance_type="g3.4xlarge", # 1 GPU, 16 CPUs, 122GiB
+ expected_instance_type="r5n.4xlarge", # 1 GPU, 16 CPUs, 128GiB
expected_num_instances=4,
),
id="sim4life-light",
@@ -1238,12 +1237,12 @@ async def test_cluster_scaling_up_starts_multiple_instances(
[
pytest.param(
_ScaleUpParams(
- imposed_instance_type="g3.4xlarge", # 1 GPU, 16 CPUs, 122GiB
+ imposed_instance_type="g4dn.2xlarge", # 1 GPU, 8 CPUs, 32GiB
service_resources=Resources(
- cpus=16, ram=TypeAdapter(ByteSize).validate_python("30Gib")
+ cpus=8, ram=TypeAdapter(ByteSize).validate_python("15Gib")
),
num_services=12,
- expected_instance_type="g3.4xlarge", # 1 GPU, 16 CPUs, 122GiB
+ expected_instance_type="g4dn.2xlarge", # 1 GPU, 8 CPUs, 32GiB
expected_num_instances=10,
),
_ScaleUpParams(
@@ -2300,9 +2299,9 @@ async def test_warm_buffers_only_replace_hot_buffer_if_service_is_started_issue7
# simulate one of the hot buffer is not drained anymore and took the pending service
random_fake_node = random.choice(fake_hot_buffer_nodes) # noqa: S311
random_fake_node.spec.labels[_OSPARC_SERVICE_READY_LABEL_KEY] = "true"
- random_fake_node.spec.labels[
- _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY
- ] = arrow.utcnow().isoformat()
+ random_fake_node.spec.labels[_OSPARC_SERVICES_READY_DATETIME_LABEL_KEY] = (
+ arrow.utcnow().isoformat()
+ )
random_fake_node.spec.availability = Availability.active
# simulate the fact that the warm buffer that just started is not yet visible
mock_find_node_with_name_returns_fake_node.return_value = None
diff --git a/services/clusters-keeper/requirements/_base.txt b/services/clusters-keeper/requirements/_base.txt
index c27de4d8e5d..d39407abe82 100644
--- a/services/clusters-keeper/requirements/_base.txt
+++ b/services/clusters-keeper/requirements/_base.txt
@@ -554,6 +554,30 @@ pydantic-extra-types==2.10.0
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../requirements/constraints.txt
# -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/../../../packages/settings-library/requirements/_base.in
diff --git a/services/clusters-keeper/requirements/_test.txt b/services/clusters-keeper/requirements/_test.txt
index 5419b8b9ab6..275b2725230 100644
--- a/services/clusters-keeper/requirements/_test.txt
+++ b/services/clusters-keeper/requirements/_test.txt
@@ -143,8 +143,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -173,10 +171,8 @@ markupsafe==3.0.2
# -c requirements/_base.txt
# jinja2
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
multidict==6.1.0
@@ -213,7 +209,7 @@ psutil==6.1.0
# via
# -c requirements/_base.txt
# -r requirements/_test.in
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -258,7 +254,6 @@ pyyaml==6.0.2
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt
index 87ea5af27fc..e06cb5585ee 100644
--- a/services/dask-sidecar/requirements/_base.txt
+++ b/services/dask-sidecar/requirements/_base.txt
@@ -378,6 +378,24 @@ pydantic-extra-types==2.10.0
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../requirements/constraints.txt
# -r requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/dask-task-models-library/requirements/../../../packages/settings-library/requirements/_base.in
# -r requirements/../../../packages/models-library/requirements/_base.in
diff --git a/services/dask-sidecar/requirements/_test.txt b/services/dask-sidecar/requirements/_test.txt
index 4642ac0a8a2..cac785dd3e5 100644
--- a/services/dask-sidecar/requirements/_test.txt
+++ b/services/dask-sidecar/requirements/_test.txt
@@ -91,8 +91,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -119,10 +117,8 @@ markupsafe==3.0.2
# -c requirements/_base.txt
# jinja2
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
networkx==3.4.2
@@ -144,7 +140,7 @@ ply==3.11
# via jsonpath-ng
pprintpp==0.4.0
# via pytest-icdiff
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -203,7 +199,6 @@ pyyaml==6.0.2
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt
index c582684c773..4b278297517 100644
--- a/services/datcore-adapter/requirements/_base.txt
+++ b/services/datcore-adapter/requirements/_base.txt
@@ -336,6 +336,18 @@ pydantic-extra-types==2.9.0
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../requirements/constraints.txt
# -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/../../../packages/settings-library/requirements/_base.in
diff --git a/services/director/requirements/_base.txt b/services/director/requirements/_base.txt
index 59dc5bf6e70..f0a9700476e 100644
--- a/services/director/requirements/_base.txt
+++ b/services/director/requirements/_base.txt
@@ -346,6 +346,18 @@ pydantic-extra-types==2.10.0
# fastapi
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../requirements/constraints.txt
# -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/../../../packages/settings-library/requirements/_base.in
diff --git a/services/efs-guardian/requirements/_base.txt b/services/efs-guardian/requirements/_base.txt
index 20fca38938e..b53278448b3 100644
--- a/services/efs-guardian/requirements/_base.txt
+++ b/services/efs-guardian/requirements/_base.txt
@@ -536,6 +536,32 @@ pydantic-extra-types==2.9.0
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/aws-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/postgres-database/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../requirements/constraints.txt
# -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/../../../packages/settings-library/requirements/_base.in
diff --git a/services/efs-guardian/requirements/_test.txt b/services/efs-guardian/requirements/_test.txt
index e881d721d80..30d77f1951e 100644
--- a/services/efs-guardian/requirements/_test.txt
+++ b/services/efs-guardian/requirements/_test.txt
@@ -142,8 +142,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -172,10 +170,8 @@ markupsafe==3.0.1
# -c requirements/_base.txt
# jinja2
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
multidict==6.1.0
@@ -211,7 +207,7 @@ psutil==6.1.0
# via
# -c requirements/_base.txt
# -r requirements/_test.in
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -256,7 +252,6 @@ pyyaml==6.0.2
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/services/payments/requirements/_base.txt b/services/payments/requirements/_base.txt
index 46195ba19aa..0d9c9bb03a5 100644
--- a/services/payments/requirements/_base.txt
+++ b/services/payments/requirements/_base.txt
@@ -408,6 +408,20 @@ pydantic-extra-types==2.10.0
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
pydantic-settings==2.6.1
# via
+ # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/postgres-database/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../requirements/constraints.txt
# -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/../../../packages/settings-library/requirements/_base.in
diff --git a/services/resource-usage-tracker/requirements/_test.txt b/services/resource-usage-tracker/requirements/_test.txt
index 1ccafa876ba..144675d1046 100644
--- a/services/resource-usage-tracker/requirements/_test.txt
+++ b/services/resource-usage-tracker/requirements/_test.txt
@@ -122,8 +122,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -158,10 +156,8 @@ markupsafe==2.1.5
# jinja2
# mako
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
mypy==1.15.0
@@ -185,7 +181,7 @@ pluggy==1.5.0
# via pytest
ply==3.11
# via jsonpath-ng
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -235,7 +231,6 @@ pyyaml==6.0.1
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/services/storage/requirements/_test.in b/services/storage/requirements/_test.in
index 0e251889777..1af7ed5e188 100644
--- a/services/storage/requirements/_test.in
+++ b/services/storage/requirements/_test.in
@@ -11,6 +11,7 @@ coverage
docker
faker
fakeredis[lua]
+flaky
jsonref
moto[server]
pandas
@@ -18,6 +19,7 @@ pytest
pytest-asyncio
pytest-celery
pytest-cov
+
pytest-icdiff
pytest-instafail
pytest-mock
diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt
index 886d2d165e3..c804dfd46d9 100644
--- a/services/storage/requirements/_test.txt
+++ b/services/storage/requirements/_test.txt
@@ -121,6 +121,8 @@ faker==36.1.1
# via -r requirements/_test.in
fakeredis==2.27.0
# via -r requirements/_test.in
+flaky==3.8.1
+ # via -r requirements/_test.in
flask==3.1.0
# via
# flask-cors
@@ -179,8 +181,6 @@ jmespath==1.0.1
# botocore
joserfc==1.0.4
# via moto
-jsondiff==2.2.1
- # via moto
jsonpatch==1.33
# via cfn-lint
jsonpath-ng==1.7.0
@@ -215,10 +215,8 @@ markupsafe==3.0.2
# -c requirements/_base.txt
# jinja2
# werkzeug
-moto==5.0.20
- # via
- # -c requirements/../../../requirements/constraints.txt
- # -r requirements/_test.in
+moto==5.1.1
+ # via -r requirements/_test.in
mpmath==1.3.0
# via sympy
multidict==6.1.0
@@ -266,7 +264,7 @@ psutil==6.1.1
# via
# -c requirements/_base.txt
# pytest-celery
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
@@ -330,7 +328,6 @@ pyyaml==6.0.2
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# cfn-lint
- # jsondiff
# jsonschema-path
# moto
# responses
diff --git a/services/storage/tests/data/file_meta_data.csv b/services/storage/tests/data/file_meta_data.csv
deleted file mode 100644
index 24bf7dc5ef8..00000000000
--- a/services/storage/tests/data/file_meta_data.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-file_id,location_id,location,bucket_name,object_name,project_id,node_id,user_id
-161b8782-b13e-5840-9ae2-e2250c231001/ad9bda7f-1dc5-5480-ab22-5fef4fc53eac/outputController.dat,0,simcore.s3,pytestbucket,161b8782-b13e-5840-9ae2-e2250c231001/ad9bda7f-1dc5-5480-ab22-5fef4fc53eac/outputController.dat,161b8782-b13e-5840-9ae2-e2250c231001,ad9bda7f-1dc5-5480-ab22-5fef4fc53eac,21
-161b8782-b13e-5840-9ae2-e2250c231001/a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8/notebooks.zip,0,simcore.s3,pytestbucket,161b8782-b13e-5840-9ae2-e2250c231001/a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8/notebooks.zip,161b8782-b13e-5840-9ae2-e2250c231001,a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8,21
diff --git a/services/storage/tests/data/notebooks.zip b/services/storage/tests/data/notebooks.zip
deleted file mode 100644
index 94ebaf90016..00000000000
--- a/services/storage/tests/data/notebooks.zip
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-2
-3
-4
diff --git a/services/storage/tests/data/outputController.dat b/services/storage/tests/data/outputController.dat
deleted file mode 100644
index 94ebaf90016..00000000000
--- a/services/storage/tests/data/outputController.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-2
-3
-4
diff --git a/services/storage/tests/data/projects.csv b/services/storage/tests/data/projects.csv
deleted file mode 100644
index 9ea1d463545..00000000000
--- a/services/storage/tests/data/projects.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,type,uuid,name,description,thumbnail,prj_owner,creation_date,last_change_date,workbench,published,access_rights,hidden
-151,STANDARD,161b8782-b13e-5840-9ae2-e2250c231001,Kember use case,Kember Cordiac Model with PostPro Viewer,"",21,2019-06-27 11:42:03.168,2019-06-27 11:43:49.128,"{""ad9bda7f-1dc5-5480-ab22-5fef4fc53eac"": {""key"": ""simcore/services/comp/kember-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Kember cardiac model"", ""inputs"": {""dt"": 0.01, ""T"": 1000, ""forcing_factor"": 0}, ""inputNodes"": [], ""outputs"": {}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 100}}, ""a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8"": {""key"": ""simcore/services/dynamic/kember-viewer"", ""version"": ""2.9.0"", ""label"": ""kember-viewer"", ""inputs"": {""outputController"": {""nodeUuid"": ""ad9bda7f-1dc5-5480-ab22-5fef4fc53eac"", ""output"": ""out_1""}}, ""inputNodes"": [""ad9bda7f-1dc5-5480-ab22-5fef4fc53eac""], ""outputs"": {}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 100}}}",false,"{}",false
diff --git a/services/storage/tests/data/users.csv b/services/storage/tests/data/users.csv
deleted file mode 100644
index d35b80d9626..00000000000
--- a/services/storage/tests/data/users.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,email,password_hash,status,role,created_at
-21,devops,devops@itis.swiss,$5$rounds=1000$jjUWjHSG5F2dMKw.$9VRlE4YLl4bPfIrWkDz/8GtEx1XkzTpuZzyc/uiBFE4,ACTIVE,USER,2019-06-27 11:35:44.828696
diff --git a/services/storage/tests/unit/test_handlers_simcore_s3.py b/services/storage/tests/unit/test_handlers_simcore_s3.py
index 7a5fbb9b71f..d3768fd09eb 100644
--- a/services/storage/tests/unit/test_handlers_simcore_s3.py
+++ b/services/storage/tests/unit/test_handlers_simcore_s3.py
@@ -516,6 +516,7 @@ async def test_create_and_delete_folders_from_project(
)
+@pytest.mark.flaky(max_runs=3)
@pytest.mark.parametrize(
"location_id",
[SimcoreS3DataManager.get_location_id()],
diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt
index 90a7f9e5259..cdc22f6b9e6 100644
--- a/services/web/server/requirements/_base.txt
+++ b/services/web/server/requirements/_base.txt
@@ -631,6 +631,34 @@ pydantic-extra-types==2.9.0
# -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
pydantic-settings==2.5.2
# via
+ # -c requirements/../../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/postgres-database/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../packages/common-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/../../../packages/common-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/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
+ # -c requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/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/../../../packages/common-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/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
diff --git a/services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py b/services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py
index 00745095081..74466ef0367 100644
--- a/services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py
+++ b/services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py
@@ -413,6 +413,7 @@ async def enforce_garbage_collect_guest(uid):
assert data["login"] != user_email
+@pytest.mark.flaky(max_runs=3)
@pytest.mark.parametrize("number_of_simultaneous_requests", [1, 2, 32])
async def test_guest_user_is_not_garbage_collected(
number_of_simultaneous_requests: int,