From 17c4ad0facc07af42138cf72ec6171d46b732e36 Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Wed, 27 Nov 2024 09:51:38 +0100 Subject: [PATCH 01/15] upgrades reqs catalog --- services/catalog/requirements/_base.txt | 188 ++++++++++++----------- services/catalog/requirements/_test.txt | 66 ++++---- services/catalog/requirements/_tools.txt | 42 +++-- 3 files changed, 156 insertions(+), 140 deletions(-) diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index 7f61e93f32a..905519e4fb2 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -1,16 +1,18 @@ -aio-pika==9.4.1 +aio-pika==9.5.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -aiocache==0.12.2 +aiocache==0.12.3 # 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 +aiodocker==0.24.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -aiofiles==23.2.1 +aiofiles==24.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -aiohttp==3.9.3 +aiohappyeyeballs==2.4.3 + # via aiohttp +aiohttp==3.11.7 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -27,15 +29,15 @@ aiohttp==3.9.3 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # aiodocker -aiormq==6.8.0 +aiormq==6.8.1 # via aio-pika aiosignal==1.3.1 # via aiohttp -alembic==1.13.1 +alembic==1.14.0 # via -r requirements/../../../packages/postgres-database/requirements/_base.in annotated-types==0.7.0 # via pydantic -anyio==4.3.0 +anyio==4.6.2.post1 # via # fast-depends # faststream @@ -49,18 +51,16 @@ arrow==1.3.0 # -r requirements/../../../packages/service-library/requirements/_base.in asgiref==3.8.1 # via opentelemetry-instrumentation-asgi -async-timeout==4.0.3 - # via asyncpg -asyncpg==0.29.0 +asyncpg==0.30.0 # via # -r requirements/_base.in # sqlalchemy -attrs==23.2.0 +attrs==24.2.0 # via # aiohttp # jsonschema # referencing -certifi==2024.2.2 +certifi==2024.8.30 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -79,56 +79,57 @@ certifi==2024.2.2 # httpcore # httpx # requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via # typer # uvicorn -deprecated==1.2.14 +deprecated==1.2.15 # via # opentelemetry-api # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # opentelemetry-semantic-conventions -dnspython==2.6.1 +dnspython==2.7.0 # via email-validator -email-validator==2.1.1 +email-validator==2.2.0 # via # fastapi # pydantic +exceptiongroup==1.2.2 + # via aio-pika fast-depends==2.4.12 # via faststream fastapi==0.115.5 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in - # prometheus-fastapi-instrumentator fastapi-cli==0.0.5 # via fastapi -faststream==0.5.28 +faststream==0.5.30 # via -r requirements/../../../packages/service-library/requirements/_base.in -frozenlist==1.4.1 +frozenlist==1.5.0 # via # aiohttp # aiosignal -googleapis-common-protos==1.65.0 +googleapis-common-protos==1.66.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -greenlet==3.0.3 +greenlet==3.1.1 # via sqlalchemy -grpcio==1.66.0 +grpcio==1.68.0 # via opentelemetry-exporter-otlp-proto-grpc h11==0.14.0 # via # httpcore # uvicorn -httpcore==1.0.4 +httpcore==1.0.7 # via httpx -httptools==0.6.1 +httptools==0.6.4 # via uvicorn -httpx==0.27.0 +httpx==0.27.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -147,18 +148,18 @@ httpx==0.27.0 # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in # fastapi -idna==3.6 +idna==3.10 # via # anyio # email-validator # httpx # requests # yarl -importlib-metadata==8.0.0 +importlib-metadata==8.5.0 # via opentelemetry-api -itsdangerous==2.1.2 +itsdangerous==2.2.0 # via fastapi -jinja2==3.1.3 +jinja2==3.1.4 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -175,13 +176,13 @@ jinja2==3.1.3 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # fastapi -jsonschema==4.21.1 +jsonschema==4.23.0 # via # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in -jsonschema-specifications==2023.7.1 +jsonschema-specifications==2024.10.1 # via jsonschema -mako==1.3.2 +mako==1.3.6 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -200,7 +201,7 @@ mako==1.3.2 # alembic markdown-it-py==3.0.0 # via rich -markupsafe==2.1.5 +markupsafe==3.0.2 # via # jinja2 # mako @@ -208,11 +209,11 @@ mdurl==0.1.2 # via markdown-it-py msgpack==1.1.0 # via aiocache -multidict==6.0.5 +multidict==6.1.0 # via # aiohttp # yarl -opentelemetry-api==1.27.0 +opentelemetry-api==1.28.2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # opentelemetry-exporter-otlp-proto-grpc @@ -226,17 +227,17 @@ opentelemetry-api==1.27.0 # opentelemetry-instrumentation-requests # opentelemetry-sdk # opentelemetry-semantic-conventions -opentelemetry-exporter-otlp==1.27.0 +opentelemetry-exporter-otlp==1.28.2 # via -r requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-exporter-otlp-proto-common==1.27.0 +opentelemetry-exporter-otlp-proto-common==1.28.2 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-grpc==1.27.0 +opentelemetry-exporter-otlp-proto-grpc==1.28.2 # via opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-http==1.27.0 +opentelemetry-exporter-otlp-proto-http==1.28.2 # via opentelemetry-exporter-otlp -opentelemetry-instrumentation==0.48b0 +opentelemetry-instrumentation==0.49b2 # via # opentelemetry-instrumentation-asgi # opentelemetry-instrumentation-asyncpg @@ -244,30 +245,31 @@ opentelemetry-instrumentation==0.48b0 # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-redis # opentelemetry-instrumentation-requests -opentelemetry-instrumentation-asgi==0.48b0 +opentelemetry-instrumentation-asgi==0.49b2 # via opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-asyncpg==0.48b0 +opentelemetry-instrumentation-asyncpg==0.49b2 # via -r requirements/../../../packages/postgres-database/requirements/_base.in -opentelemetry-instrumentation-fastapi==0.48b0 +opentelemetry-instrumentation-fastapi==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -opentelemetry-instrumentation-httpx==0.48b0 +opentelemetry-instrumentation-httpx==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -opentelemetry-instrumentation-redis==0.48b0 +opentelemetry-instrumentation-redis==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-instrumentation-requests==0.48b0 +opentelemetry-instrumentation-requests==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-proto==1.27.0 +opentelemetry-proto==1.28.2 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-sdk==1.27.0 +opentelemetry-sdk==1.28.2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-semantic-conventions==0.48b0 +opentelemetry-semantic-conventions==0.49b2 # via + # opentelemetry-instrumentation # opentelemetry-instrumentation-asgi # opentelemetry-instrumentation-asyncpg # opentelemetry-instrumentation-fastapi @@ -275,13 +277,13 @@ opentelemetry-semantic-conventions==0.48b0 # opentelemetry-instrumentation-redis # opentelemetry-instrumentation-requests # opentelemetry-sdk -opentelemetry-util-http==0.48b0 +opentelemetry-util-http==0.49b2 # via # opentelemetry-instrumentation-asgi # opentelemetry-instrumentation-fastapi # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-requests -orjson==3.10.0 +orjson==3.10.12 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -307,25 +309,31 @@ orjson==3.10.0 # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in # fastapi -packaging==24.0 - # via -r requirements/_base.in +packaging==24.2 + # via + # -r requirements/_base.in + # opentelemetry-instrumentation pamqp==3.3.0 # via aiormq -prometheus-client==0.20.0 +prometheus-client==0.21.0 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # prometheus-fastapi-instrumentator -prometheus-fastapi-instrumentator==6.1.0 +prometheus-fastapi-instrumentator==7.0.0 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -protobuf==4.25.4 +propcache==0.2.0 + # via + # aiohttp + # yarl +protobuf==5.28.3 # via # googleapis-common-protos # opentelemetry-proto -psutil==6.0.0 +psutil==6.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -psycopg2-binary==2.9.9 +psycopg2-binary==2.9.10 # via sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -359,9 +367,9 @@ pydantic==2.9.2 # fastapi # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic -pydantic-extra-types==2.9.0 +pydantic-extra-types==2.10.0 # via # -r requirements/../../../packages/common-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/_base.in @@ -380,9 +388,9 @@ pydantic-settings==2.6.1 # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in # fastapi -pygments==2.17.2 +pygments==2.18.0 # via rich -pyinstrument==4.6.2 +pyinstrument==5.0.0 # via -r requirements/../../../packages/service-library/requirements/_base.in python-dateutil==2.9.0.post0 # via arrow @@ -390,9 +398,9 @@ python-dotenv==1.0.1 # via # pydantic-settings # uvicorn -python-multipart==0.0.9 +python-multipart==0.0.17 # via fastapi -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -412,7 +420,7 @@ pyyaml==6.0.1 # -r requirements/_base.in # fastapi # uvicorn -redis==5.0.4 +redis==5.2.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -430,26 +438,23 @@ redis==5.0.4 # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/service-library/requirements/_base.in # aiocache -referencing==0.29.3 +referencing==0.35.1 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 # via -r requirements/../../../packages/service-library/requirements/_base.in requests==2.32.3 # via opentelemetry-exporter-otlp-proto-http -rich==13.7.1 +rich==13.9.4 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in # typer -rpds-py==0.18.0 +rpds-py==0.21.0 # via # jsonschema # referencing -setuptools==74.0.0 - # via opentelemetry-instrumentation shellingham==1.5.4 # via typer six==1.16.0 @@ -458,7 +463,7 @@ sniffio==1.3.1 # via # anyio # httpx -sqlalchemy==1.4.52 +sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -476,7 +481,7 @@ sqlalchemy==1.4.52 # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in # alembic -starlette==0.41.0 +starlette==0.41.3 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -493,33 +498,34 @@ starlette==0.41.0 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # fastapi -tenacity==8.5.0 + # prometheus-fastapi-instrumentator +tenacity==9.0.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in -toolz==0.12.1 +toolz==1.0.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -tqdm==4.66.2 +tqdm==4.67.1 # via -r requirements/../../../packages/service-library/requirements/_base.in -typer==0.12.3 +typer==0.13.1 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in # fastapi-cli -types-python-dateutil==2.9.0.20240316 +types-python-dateutil==2.9.0.20241003 # via arrow -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # aiodebug - # aiodocker # alembic # fastapi # faststream # opentelemetry-sdk # pydantic # pydantic-core + # pydantic-extra-types # typer -ujson==5.9.0 +ujson==5.10.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -553,27 +559,29 @@ urllib3==2.2.3 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # requests -uvicorn==0.29.0 +uvicorn==0.32.1 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # fastapi # fastapi-cli -uvloop==0.19.0 +uvloop==0.21.0 # via uvicorn -watchfiles==0.21.0 +watchfiles==1.0.0 # via uvicorn -websockets==12.0 +websockets==14.1 # via uvicorn -wrapt==1.16.0 +wrapt==1.17.0 # via # deprecated # opentelemetry-instrumentation + # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-redis -yarl==1.9.4 +yarl==1.18.0 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq -zipp==3.20.1 +zipp==3.21.0 # via importlib-metadata diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index a379e35f4d5..7ac967ec713 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -1,4 +1,8 @@ -aiohttp==3.9.3 +aiohappyeyeballs==2.4.3 + # via + # -c requirements/_base.txt + # aiohttp +aiohttp==3.11.7 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -7,31 +11,31 @@ aiosignal==1.3.1 # via # -c requirements/_base.txt # aiohttp -alembic==1.13.1 +alembic==1.14.0 # via # -c requirements/_base.txt # -r requirements/_test.in -anyio==4.3.0 +anyio==4.6.2.post1 # via # -c requirements/_base.txt # httpx asgi-lifespan==2.1.0 # via -r requirements/_test.in -attrs==23.2.0 +attrs==24.2.0 # via # -c requirements/_base.txt # aiohttp # jsonschema # pytest-docker # referencing -certifi==2024.2.2 +certifi==2024.8.30 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # httpcore # httpx # requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via # -c requirements/_base.txt # requests @@ -39,18 +43,18 @@ click==8.1.7 # via # -c requirements/_base.txt # -r requirements/_test.in -coverage==7.6.1 +coverage==7.6.8 # via pytest-cov docker==7.1.0 # via -r requirements/_test.in -faker==29.0.0 +faker==33.0.0 # via -r requirements/_test.in -frozenlist==1.4.1 +frozenlist==1.5.0 # via # -c requirements/_base.txt # aiohttp # aiosignal -greenlet==3.0.3 +greenlet==3.1.1 # via # -c requirements/_base.txt # sqlalchemy @@ -58,16 +62,16 @@ h11==0.14.0 # via # -c requirements/_base.txt # httpcore -httpcore==1.0.4 +httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.27.0 +httpx==0.27.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # respx -idna==3.6 +idna==3.10 # via # -c requirements/_base.txt # anyio @@ -76,38 +80,43 @@ idna==3.6 # yarl iniconfig==2.0.0 # via pytest -jsonschema==4.21.1 +jsonschema==4.23.0 # via # -c requirements/_base.txt # -r requirements/_test.in -jsonschema-specifications==2023.7.1 +jsonschema-specifications==2024.10.1 # via # -c requirements/_base.txt # jsonschema -mako==1.3.2 +mako==1.3.6 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # alembic -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -c requirements/_base.txt # mako -multidict==6.0.5 +multidict==6.1.0 # via # -c requirements/_base.txt # aiohttp # yarl -mypy==1.12.0 +mypy==1.13.0 # via sqlalchemy mypy-extensions==1.0.0 # via mypy -packaging==24.0 +packaging==24.2 # via # -c requirements/_base.txt # pytest pluggy==1.5.0 # via pytest +propcache==0.2.0 + # via + # -c requirements/_base.txt + # aiohttp + # yarl ptvsd==4.3.2 # via -r requirements/_test.in py-cpuinfo==9.0.0 @@ -127,9 +136,9 @@ pytest-asyncio==0.23.8 # via # -c requirements/../../../requirements/constraints.txt # pytest-aiohttp -pytest-benchmark==4.0.0 +pytest-benchmark==5.1.0 # via -r requirements/_test.in -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/_test.in pytest-docker==3.1.1 # via -r requirements/_test.in @@ -141,7 +150,7 @@ python-dateutil==2.9.0.post0 # via # -c requirements/_base.txt # faker -referencing==0.29.3 +referencing==0.35.1 # via # -c requirements/_base.txt # jsonschema @@ -152,7 +161,7 @@ requests==2.32.3 # docker respx==0.21.1 # via -r requirements/_test.in -rpds-py==0.18.0 +rpds-py==0.21.0 # via # -c requirements/_base.txt # jsonschema @@ -167,7 +176,7 @@ sniffio==1.3.1 # anyio # asgi-lifespan # httpx -sqlalchemy==1.4.52 +sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -175,14 +184,15 @@ sqlalchemy==1.4.52 # alembic sqlalchemy2-stubs==0.0.2a38 # via sqlalchemy -types-psycopg2==2.9.21.20240819 +types-psycopg2==2.9.21.20241019 # via -r requirements/_test.in types-pyyaml==6.0.12.20240917 # via -r requirements/_test.in -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # alembic + # faker # mypy # sqlalchemy2-stubs urllib3==2.2.3 @@ -191,7 +201,7 @@ urllib3==2.2.3 # -c requirements/_base.txt # docker # requests -yarl==1.9.4 +yarl==1.18.0 # via # -c requirements/_base.txt # aiohttp diff --git a/services/catalog/requirements/_tools.txt b/services/catalog/requirements/_tools.txt index 97a60860ebb..032737dadc0 100644 --- a/services/catalog/requirements/_tools.txt +++ b/services/catalog/requirements/_tools.txt @@ -1,8 +1,8 @@ -astroid==3.3.4 +astroid==3.3.5 # via pylint -black==24.8.0 +black==24.10.0 # via -r requirements/../../../requirements/devenv.txt -build==1.2.2 +build==1.2.2.post1 # via pip-tools bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -14,13 +14,13 @@ click==8.1.7 # -c requirements/_test.txt # black # pip-tools -dill==0.3.8 +dill==0.3.9 # via pylint -distlib==0.3.8 +distlib==0.3.9 # via virtualenv filelock==3.16.1 # via virtualenv -identify==2.6.1 +identify==2.6.3 # via pre-commit isort==5.13.2 # via @@ -28,7 +28,7 @@ isort==5.13.2 # pylint mccabe==0.7.0 # via pylint -mypy==1.12.0 +mypy==1.13.0 # via # -c requirements/_test.txt # -r requirements/../../../requirements/devenv.txt @@ -39,7 +39,7 @@ mypy-extensions==1.0.0 # mypy nodeenv==1.9.1 # via pre-commit -packaging==24.0 +packaging==24.2 # via # -c requirements/_base.txt # -c requirements/_test.txt @@ -47,7 +47,7 @@ packaging==24.0 # build pathspec==0.12.1 # via black -pip==24.2 +pip==24.3.1 # via pip-tools pip-tools==7.4.1 # via -r requirements/../../../requirements/devenv.txt @@ -56,35 +56,33 @@ platformdirs==4.3.6 # black # pylint # virtualenv -pre-commit==3.8.0 +pre-commit==4.0.1 # via -r requirements/../../../requirements/devenv.txt -pylint==3.3.0 +pylint==3.3.1 # via -r requirements/../../../requirements/devenv.txt -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -c requirements/_base.txt # pre-commit # watchdog -ruff==0.6.7 +ruff==0.8.0 # via -r requirements/../../../requirements/devenv.txt -setuptools==74.0.0 - # via - # -c requirements/_base.txt - # pip-tools +setuptools==75.6.0 + # via pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt # mypy -virtualenv==20.26.5 +virtualenv==20.28.0 # via pre-commit -watchdog==5.0.2 +watchdog==6.0.0 # via -r requirements/_tools.in -wheel==0.44.0 +wheel==0.45.1 # via pip-tools From 4a8bc8731210713c2ac18791ee4a41fae4afe170 Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:42:37 +0100 Subject: [PATCH 02/15] mypy --- .../src/simcore_service_catalog/core/settings.py | 14 ++++++++------ .../simcore_service_catalog/models/services_db.py | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/services/catalog/src/simcore_service_catalog/core/settings.py b/services/catalog/src/simcore_service_catalog/core/settings.py index dc49cbbf68e..9c36ff5ba43 100644 --- a/services/catalog/src/simcore_service_catalog/core/settings.py +++ b/services/catalog/src/simcore_service_catalog/core/settings.py @@ -1,6 +1,6 @@ import logging from functools import cached_property -from typing import Final +from typing import Annotated, Final from models_library.api_schemas_catalog.services_specifications import ( ServiceSpecifications, @@ -44,12 +44,14 @@ def base_url(self) -> str: class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings): - LOG_LEVEL: LogLevel = Field( - LogLevel.INFO.value, - validation_alias=AliasChoices( - "CATALOG_LOG_LEVEL", "CATALOG_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL" + LOG_LEVEL: Annotated[ + LogLevel, + Field( + validation_alias=AliasChoices( + "CATALOG_LOG_LEVEL", "CATALOG_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL" + ), ), - ) + ] = LogLevel.INFO CATALOG_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field( default=False, validation_alias=AliasChoices( diff --git a/services/catalog/src/simcore_service_catalog/models/services_db.py b/services/catalog/src/simcore_service_catalog/models/services_db.py index 0412ba6878a..89a61af2e7a 100644 --- a/services/catalog/src/simcore_service_catalog/models/services_db.py +++ b/services/catalog/src/simcore_service_catalog/models/services_db.py @@ -17,8 +17,9 @@ class ServiceMetaDataAtDB(ServiceKeyVersion, ServiceMetaDataEditable): thumbnail: Annotated[str, HttpUrl] | None = None description: str | None = None - classifiers: list[str] | None = Field(default_factory=list) + classifiers: Annotated[list[str] | None, Field(default_factory=list)] owner: PositiveInt | None = None + model_config = ConfigDict( from_attributes=True, json_schema_extra={ From 65eb26d7eb6c5a689eff35deb14feb5d2b472d5f Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:47:31 +0100 Subject: [PATCH 03/15] updates oas --- services/catalog/openapi.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/services/catalog/openapi.json b/services/catalog/openapi.json index c5663631059..5f5204053cd 100644 --- a/services/catalog/openapi.json +++ b/services/catalog/openapi.json @@ -3,7 +3,7 @@ "info": { "title": "simcore-service-catalog", "description": "Manages and maintains a catalog of all published components (e.g. macro-algorithms, scripts, etc)", - "version": "0.5.0" + "version": "0.6.0" }, "paths": { "/": { @@ -628,17 +628,11 @@ }, "image": { "type": "string", - "maxLength": 2083, - "minLength": 1, - "format": "uri", "title": "Image", "description": "Url to the badge" }, "url": { "type": "string", - "maxLength": 2083, - "minLength": 1, - "format": "uri", "title": "Url", "description": "Link to the status" } @@ -3082,7 +3076,8 @@ "type": "null" } ], - "title": "Owner" + "title": "Owner", + "description": "None when the owner email cannot be found in the database" } }, "type": "object", @@ -3549,7 +3544,10 @@ "thumbnail": { "anyOf": [ { - "type": "string" + "type": "string", + "maxLength": 2083, + "minLength": 1, + "format": "uri" }, { "type": "null" From b5210c5619119ae564a96b1f29bf0b50112772cc Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:01:01 +0100 Subject: [PATCH 04/15] rm tracing from e2e --- tests/e2e-playwright/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/e2e-playwright/Makefile b/tests/e2e-playwright/Makefile index 40fe914b9c0..ed412fcbd79 100644 --- a/tests/e2e-playwright/Makefile +++ b/tests/e2e-playwright/Makefile @@ -16,11 +16,14 @@ SIMCORE_DOT_ENV = $(abspath $(CURDIR)/../../.env) define _up_simcore # set some parameters to allow for e2e to run -echo LOGIN_REGISTRATION_INVITATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) -echo LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) -echo DIRECTOR_DEFAULT_MAX_NANO_CPUS=1000000000 >> $(SIMCORE_DOT_ENV) echo DIRECTOR_DEFAULT_MAX_MEMORY=134217728 >> $(SIMCORE_DOT_ENV) +echo DIRECTOR_DEFAULT_MAX_NANO_CPUS=1000000000 >> $(SIMCORE_DOT_ENV) +echo LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) +echo LOGIN_REGISTRATION_INVITATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) echo SIDECAR_FORCE_CPU_NODE=1 >> $(SIMCORE_DOT_ENV) +echo TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=null +echo TRACING_OPENTELEMETRY_COLLECTOR_PORT=null + $(MAKE_C) $(REPO_BASE_DIR) up-prod ops_ci=1 endef From 7de979eeb6032afc9a257049f5e46df8c7e0fea9 Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:03:47 +0100 Subject: [PATCH 05/15] forgot --- tests/e2e-playwright/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e-playwright/Makefile b/tests/e2e-playwright/Makefile index ed412fcbd79..f974cafefe7 100644 --- a/tests/e2e-playwright/Makefile +++ b/tests/e2e-playwright/Makefile @@ -21,8 +21,8 @@ echo DIRECTOR_DEFAULT_MAX_NANO_CPUS=1000000000 >> $(SIMCORE_DOT_ENV) echo LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) echo LOGIN_REGISTRATION_INVITATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) echo SIDECAR_FORCE_CPU_NODE=1 >> $(SIMCORE_DOT_ENV) -echo TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=null -echo TRACING_OPENTELEMETRY_COLLECTOR_PORT=null +echo TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=null >> $(SIMCORE_DOT_ENV) +echo TRACING_OPENTELEMETRY_COLLECTOR_PORT=null >> $(SIMCORE_DOT_ENV) $(MAKE_C) $(REPO_BASE_DIR) up-prod ops_ci=1 endef From f6963cbdf075af812dc02d0e788e3f74358cbbaa Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:05:33 +0100 Subject: [PATCH 06/15] doc --- tests/e2e-playwright/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e-playwright/Makefile b/tests/e2e-playwright/Makefile index f974cafefe7..dfee6eb774a 100644 --- a/tests/e2e-playwright/Makefile +++ b/tests/e2e-playwright/Makefile @@ -21,6 +21,7 @@ echo DIRECTOR_DEFAULT_MAX_NANO_CPUS=1000000000 >> $(SIMCORE_DOT_ENV) echo LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) echo LOGIN_REGISTRATION_INVITATION_REQUIRED=0 >> $(SIMCORE_DOT_ENV) echo SIDECAR_FORCE_CPU_NODE=1 >> $(SIMCORE_DOT_ENV) +# DISABLED: test setup has no otl service echo TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=null >> $(SIMCORE_DOT_ENV) echo TRACING_OPENTELEMETRY_COLLECTOR_PORT=null >> $(SIMCORE_DOT_ENV) From 4e55c7e46c338b325061dc87526882692222a780 Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Thu, 28 Nov 2024 18:39:52 +0100 Subject: [PATCH 07/15] last upgrades --- services/catalog/requirements/_base.txt | 12 +++++------- services/catalog/requirements/_test.txt | 7 +++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index 905519e4fb2..c8f071f3b3c 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -1,4 +1,4 @@ -aio-pika==9.5.0 +aio-pika==9.5.1 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.3 # via @@ -12,7 +12,7 @@ aiofiles==24.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiohappyeyeballs==2.4.3 # via aiohttp -aiohttp==3.11.7 +aiohttp==3.11.8 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -129,7 +129,7 @@ httpcore==1.0.7 # via httpx httptools==0.6.4 # via uvicorn -httpx==0.27.2 +httpx==0.28.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -325,7 +325,7 @@ propcache==0.2.0 # via # aiohttp # yarl -protobuf==5.28.3 +protobuf==5.29.0 # via # googleapis-common-protos # opentelemetry-proto @@ -460,9 +460,7 @@ shellingham==1.5.4 six==1.16.0 # via python-dateutil sniffio==1.3.1 - # via - # anyio - # httpx + # via anyio sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index 7ac967ec713..3ab6c919fe4 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -2,7 +2,7 @@ aiohappyeyeballs==2.4.3 # via # -c requirements/_base.txt # aiohttp -aiohttp==3.11.7 +aiohttp==3.11.8 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -47,7 +47,7 @@ coverage==7.6.8 # via pytest-cov docker==7.1.0 # via -r requirements/_test.in -faker==33.0.0 +faker==33.1.0 # via -r requirements/_test.in frozenlist==1.5.0 # via @@ -66,7 +66,7 @@ httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.27.2 +httpx==0.28.0 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -175,7 +175,6 @@ sniffio==1.3.1 # -c requirements/_base.txt # anyio # asgi-lifespan - # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt From b3bd671bebabdac5b3940a8e6743813d1414da3e Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Thu, 28 Nov 2024 18:54:15 +0100 Subject: [PATCH 08/15] downgrades httpx again --- services/catalog/requirements/_base.txt | 6 ++++-- services/catalog/requirements/_test.txt | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index c8f071f3b3c..108ddb7989b 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -129,7 +129,7 @@ httpcore==1.0.7 # via httpx httptools==0.6.4 # via uvicorn -httpx==0.28.0 +httpx==0.27.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -460,7 +460,9 @@ shellingham==1.5.4 six==1.16.0 # via python-dateutil sniffio==1.3.1 - # via anyio + # via + # anyio + # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index 3ab6c919fe4..33af4b296b9 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -66,7 +66,7 @@ httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.28.0 +httpx==0.27.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -175,6 +175,7 @@ sniffio==1.3.1 # -c requirements/_base.txt # anyio # asgi-lifespan + # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt From 6f1519e1858f2ef30c9abf162578f79f5347daaf Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:51:45 +0100 Subject: [PATCH 09/15] uniform pydantic --- packages/aws-library/requirements/_base.txt | 6 ++-- packages/aws-library/requirements/_test.txt | 4 +-- .../common-library/requirements/_base.txt | 4 +-- .../common-library/requirements/_test.txt | 4 +-- .../requirements/_base.txt | 4 +-- .../models-library/requirements/_base.txt | 4 +-- .../requirements/_base.txt | 4 +-- .../postgres-database/requirements/_base.txt | 4 +-- .../requirements/_base.txt | 4 +-- .../service-library/requirements/_base.txt | 4 +-- .../service-library/requirements/_fastapi.txt | 4 +-- .../settings-library/requirements/_base.txt | 4 +-- packages/simcore-sdk/requirements/_base.txt | 6 ++-- packages/simcore-sdk/requirements/_test.txt | 4 +-- requirements/constraints.txt | 2 +- services/api-server/requirements/_base.txt | 8 +++-- services/api-server/requirements/_test.txt | 2 +- services/api-server/requirements/_tools.txt | 2 +- services/autoscaling/requirements/_base.txt | 10 +++--- services/autoscaling/requirements/_test.txt | 6 ++-- services/autoscaling/requirements/_tools.txt | 2 +- .../clusters-keeper/requirements/_base.txt | 10 +++--- .../clusters-keeper/requirements/_test.txt | 6 ++-- .../clusters-keeper/requirements/_tools.txt | 2 +- services/dask-sidecar/requirements/_base.txt | 8 ++--- services/dask-sidecar/requirements/_test.txt | 6 ++-- services/dask-sidecar/requirements/_tools.txt | 2 +- .../datcore-adapter/requirements/_base.txt | 8 ++--- .../datcore-adapter/requirements/_test.txt | 2 +- .../datcore-adapter/requirements/_tools.txt | 2 +- services/director-v2/requirements/_base.txt | 10 +++--- services/director-v2/requirements/_test.txt | 2 +- services/director-v2/requirements/_tools.txt | 2 +- services/director/requirements/_base.txt | 6 ++-- services/efs-guardian/requirements/_base.txt | 8 ++--- services/efs-guardian/requirements/_test.txt | 4 +-- .../requirements/_base.txt | 4 +-- .../requirements/_base.txt | 10 +++--- .../requirements/_test.txt | 6 ++-- .../requirements/_tools.txt | 2 +- services/storage/requirements/_base.txt | 8 +++-- services/storage/requirements/_test.txt | 6 ++-- services/storage/requirements/_tools.txt | 2 +- services/web/server/requirements/_base.txt | 8 +++-- services/web/server/requirements/_test.txt | 2 +- services/web/server/requirements/_tools.txt | 2 +- tests/e2e-playwright/requirements/_test.txt | 34 ++++++++----------- .../requirements/requirements.txt | 4 +-- tests/public-api/requirements/_base.txt | 4 +-- tests/swarm-deploy/requirements/_test.txt | 8 ++--- 50 files changed, 135 insertions(+), 135 deletions(-) diff --git a/packages/aws-library/requirements/_base.txt b/packages/aws-library/requirements/_base.txt index a3a10ea494a..7dcd05bb8ff 100644 --- a/packages/aws-library/requirements/_base.txt +++ b/packages/aws-library/requirements/_base.txt @@ -218,7 +218,7 @@ protobuf==4.25.5 # opentelemetry-proto psutil==6.0.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -247,7 +247,7 @@ pydantic==2.9.2 # fast-depends # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -307,7 +307,6 @@ redis==5.0.4 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -393,6 +392,7 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.12.1 # via + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/packages/aws-library/requirements/_test.txt b/packages/aws-library/requirements/_test.txt index eef079aef0f..43094bcee75 100644 --- a/packages/aws-library/requirements/_test.txt +++ b/packages/aws-library/requirements/_test.txt @@ -158,12 +158,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic diff --git a/packages/common-library/requirements/_base.txt b/packages/common-library/requirements/_base.txt index a0162daa052..d9f0a777898 100644 --- a/packages/common-library/requirements/_base.txt +++ b/packages/common-library/requirements/_base.txt @@ -4,12 +4,12 @@ orjson==3.10.10 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in # pydantic-extra-types -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via -r requirements/_base.in diff --git a/packages/common-library/requirements/_test.txt b/packages/common-library/requirements/_test.txt index abf7c70b23c..54c88775b99 100644 --- a/packages/common-library/requirements/_test.txt +++ b/packages/common-library/requirements/_test.txt @@ -20,12 +20,12 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic diff --git a/packages/dask-task-models-library/requirements/_base.txt b/packages/dask-task-models-library/requirements/_base.txt index 82af72057cd..bd0ea522099 100644 --- a/packages/dask-task-models-library/requirements/_base.txt +++ b/packages/dask-task-models-library/requirements/_base.txt @@ -76,7 +76,7 @@ partd==1.4.2 # via dask psutil==6.0.0 # via distributed -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -92,7 +92,7 @@ pydantic==2.9.2 # -r requirements/_base.in # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via diff --git a/packages/models-library/requirements/_base.txt b/packages/models-library/requirements/_base.txt index b4bda5f971d..4f39846aa2a 100644 --- a/packages/models-library/requirements/_base.txt +++ b/packages/models-library/requirements/_base.txt @@ -22,7 +22,7 @@ orjson==3.10.7 # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/common-library/requirements/_base.in # -r requirements/_base.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -30,7 +30,7 @@ pydantic==2.9.2 # -r requirements/_base.in # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via diff --git a/packages/notifications-library/requirements/_base.txt b/packages/notifications-library/requirements/_base.txt index 560e3e1e3b6..efae1c659d9 100644 --- a/packages/notifications-library/requirements/_base.txt +++ b/packages/notifications-library/requirements/_base.txt @@ -102,7 +102,7 @@ packaging==24.2 # via opentelemetry-instrumentation psycopg2-binary==2.9.9 # via sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -121,7 +121,7 @@ pydantic==2.9.2 # -r requirements/../../../packages/settings-library/requirements/_base.in # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via diff --git a/packages/postgres-database/requirements/_base.txt b/packages/postgres-database/requirements/_base.txt index 4eddd14e0e4..bd8e9dfc87c 100644 --- a/packages/postgres-database/requirements/_base.txt +++ b/packages/postgres-database/requirements/_base.txt @@ -43,14 +43,14 @@ orjson==3.10.11 # -r requirements/../../../packages/common-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/common-library/requirements/_base.in # -r requirements/_base.in # pydantic-extra-types -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.10.0 # via -r requirements/../../../packages/common-library/requirements/_base.in diff --git a/packages/service-integration/requirements/_base.txt b/packages/service-integration/requirements/_base.txt index 810abab5e48..d65c8cab39f 100644 --- a/packages/service-integration/requirements/_base.txt +++ b/packages/service-integration/requirements/_base.txt @@ -79,7 +79,7 @@ packaging==24.1 # via pytest pluggy==1.5.0 # via pytest -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -90,7 +90,7 @@ pydantic==2.9.2 # -r requirements/../../../packages/models-library/requirements/_base.in # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt index d4a84148c40..32c7ed8c399 100644 --- a/packages/service-library/requirements/_base.txt +++ b/packages/service-library/requirements/_base.txt @@ -160,7 +160,7 @@ protobuf==4.25.5 # opentelemetry-proto psutil==6.0.0 # via -r requirements/_base.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -177,7 +177,7 @@ pydantic==2.9.2 # fast-depends # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via diff --git a/packages/service-library/requirements/_fastapi.txt b/packages/service-library/requirements/_fastapi.txt index b93f8be5cc4..060e7373c38 100644 --- a/packages/service-library/requirements/_fastapi.txt +++ b/packages/service-library/requirements/_fastapi.txt @@ -81,7 +81,7 @@ prometheus-client==0.21.0 # prometheus-fastapi-instrumentator prometheus-fastapi-instrumentator==6.1.0 # via -r requirements/_fastapi.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -90,7 +90,7 @@ pydantic==2.9.2 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # fastapi -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic setuptools==75.1.0 # via opentelemetry-instrumentation diff --git a/packages/settings-library/requirements/_base.txt b/packages/settings-library/requirements/_base.txt index 2e155733652..471c16bb6f1 100644 --- a/packages/settings-library/requirements/_base.txt +++ b/packages/settings-library/requirements/_base.txt @@ -11,7 +11,7 @@ orjson==3.10.10 # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/common-library/requirements/_base.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt @@ -19,7 +19,7 @@ pydantic==2.9.2 # -r requirements/_base.in # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via -r requirements/../../../packages/common-library/requirements/_base.in diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index d2fa58f9494..6d17171221a 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -256,7 +256,7 @@ psycopg2-binary==2.9.9 # via # aiopg # sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -289,7 +289,7 @@ pydantic==2.9.2 # fast-depends # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -352,7 +352,6 @@ redis==5.0.4 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -450,6 +449,7 @@ wrapt==1.16.0 yarl==1.12.1 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/packages/simcore-sdk/requirements/_test.txt b/packages/simcore-sdk/requirements/_test.txt index 3065f3672cb..57b0f49bef7 100644 --- a/packages/simcore-sdk/requirements/_test.txt +++ b/packages/simcore-sdk/requirements/_test.txt @@ -206,12 +206,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 3e40b2694d4..1d4583199e8 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -18,7 +18,6 @@ mako>=1.2.2 # https://github.com/advisories/GH orjson>=3.9.15 # https://github.com/advisories/GHSA-pwr2-4v36-6qpr paramiko>=2.10.1 # https://github.com/advisories/GHSA-f8q4-jwww-x3wv py>=1.11.0 # https://github.com/advisories/GHSA-w596-4wvx-j9j6 / CVE-2022-42969 -pydantic>=1.8.2 # https://github.com/advisories/GHSA-5jqp-qgf6-3pvh pyyaml>=5.4 # https://github.com/advisories/GHSA-8q59-q68h-6hv4 redis>=4.5.4 # https://github.com/advisories/GHSA-24wv-mv5m-xv4h rsa>=4.1 # https://github.com/advisories/GHSA-537h-rv9q-vvph @@ -52,6 +51,7 @@ pytest-asyncio<0.24 # Compatibility/coordination ----------------------------------------------------------------------------------------- # +pydantic>=2.10.0 # _pickle.UnpicklingError: NEWOBJ class argument must be a type, not _AnnotatedAlias # constraint since https://github.com/MagicStack/uvloop/releases/tag/v0.15.0: drops support for 3.5/3.6 Feb.2021 diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 50bb56b4e69..300d8ef2d98 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -512,7 +512,7 @@ psycopg2-binary==2.9.9 # sqlalchemy pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -575,7 +575,7 @@ pydantic==2.9.2 # fastapi-pagination # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -809,7 +809,7 @@ typer==0.12.3 # fastapi-cli types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -907,7 +907,9 @@ wrapt==1.16.0 yarl==1.9.4 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 26f93fde738..e5254193173 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -320,7 +320,7 @@ types-boto3==1.0.2 # via -r requirements/_test.in types-s3transfer==0.10.2 # via boto3-stubs -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # alembic diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index 8b1f4a36d83..795564deb10 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -93,7 +93,7 @@ setuptools==69.2.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/autoscaling/requirements/_base.txt b/services/autoscaling/requirements/_base.txt index 39676c07d5b..179686d05a5 100644 --- a/services/autoscaling/requirements/_base.txt +++ b/services/autoscaling/requirements/_base.txt @@ -436,7 +436,7 @@ psutil==6.0.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # distributed -pydantic==2.9.2 +pydantic==2.10.2 # 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 @@ -489,7 +489,7 @@ pydantic==2.9.2 # fastapi # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -592,8 +592,6 @@ redis==5.0.4 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/./constraints.txt - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -700,7 +698,7 @@ types-awscrt==0.20.9 # via botocore-stubs types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -754,6 +752,8 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.9.4 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/autoscaling/requirements/_test.txt b/services/autoscaling/requirements/_test.txt index e019e4f118b..b6342993557 100644 --- a/services/autoscaling/requirements/_test.txt +++ b/services/autoscaling/requirements/_test.txt @@ -185,12 +185,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic @@ -319,7 +319,7 @@ types-awscrt==0.20.9 # botocore-stubs types-pyyaml==6.0.12.20240917 # via -r requirements/_test.in -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # aws-sam-translator diff --git a/services/autoscaling/requirements/_tools.txt b/services/autoscaling/requirements/_tools.txt index dec3b9c204d..94d944fd4d1 100644 --- a/services/autoscaling/requirements/_tools.txt +++ b/services/autoscaling/requirements/_tools.txt @@ -77,7 +77,7 @@ setuptools==74.0.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/clusters-keeper/requirements/_base.txt b/services/clusters-keeper/requirements/_base.txt index c642e30aa64..714eec4f927 100644 --- a/services/clusters-keeper/requirements/_base.txt +++ b/services/clusters-keeper/requirements/_base.txt @@ -434,7 +434,7 @@ psutil==6.0.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # distributed -pydantic==2.9.2 +pydantic==2.10.2 # 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 @@ -487,7 +487,7 @@ pydantic==2.9.2 # fastapi # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -590,8 +590,6 @@ redis==5.0.4 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/./constraints.txt - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -698,7 +696,7 @@ types-awscrt==0.20.9 # via botocore-stubs types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -752,6 +750,8 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.9.4 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/clusters-keeper/requirements/_test.txt b/services/clusters-keeper/requirements/_test.txt index 4e297870fd4..0af083a1485 100644 --- a/services/clusters-keeper/requirements/_test.txt +++ b/services/clusters-keeper/requirements/_test.txt @@ -205,12 +205,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic @@ -309,7 +309,7 @@ sympy==1.13.3 # via cfn-lint types-pyyaml==6.0.12.20240917 # via -r requirements/_test.in -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # aiodocker diff --git a/services/clusters-keeper/requirements/_tools.txt b/services/clusters-keeper/requirements/_tools.txt index dec3b9c204d..94d944fd4d1 100644 --- a/services/clusters-keeper/requirements/_tools.txt +++ b/services/clusters-keeper/requirements/_tools.txt @@ -77,7 +77,7 @@ setuptools==74.0.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt index e3cd751062d..2f07851d322 100644 --- a/services/dask-sidecar/requirements/_base.txt +++ b/services/dask-sidecar/requirements/_base.txt @@ -310,7 +310,7 @@ psutil==6.0.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in # distributed -pydantic==2.9.2 +pydantic==2.10.2 # 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 @@ -351,7 +351,7 @@ pydantic==2.9.2 # fast-depends # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -436,7 +436,6 @@ redis==5.0.4 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -491,7 +490,7 @@ typer==0.12.3 # -r requirements/../../../packages/settings-library/requirements/_base.in types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -535,6 +534,7 @@ xyzservices==2024.4.0 # via bokeh yarl==1.9.4 # via + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/dask-sidecar/requirements/_test.txt b/services/dask-sidecar/requirements/_test.txt index db273aba95a..25ef41fa488 100644 --- a/services/dask-sidecar/requirements/_test.txt +++ b/services/dask-sidecar/requirements/_test.txt @@ -145,12 +145,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic @@ -246,7 +246,7 @@ termcolor==2.4.0 # via pytest-sugar types-aiofiles==24.1.0.20240626 # via -r requirements/_test.in -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # aws-sam-translator diff --git a/services/dask-sidecar/requirements/_tools.txt b/services/dask-sidecar/requirements/_tools.txt index dec3b9c204d..94d944fd4d1 100644 --- a/services/dask-sidecar/requirements/_tools.txt +++ b/services/dask-sidecar/requirements/_tools.txt @@ -77,7 +77,7 @@ setuptools==74.0.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt index 476901f832b..19c4695c3e9 100644 --- a/services/datcore-adapter/requirements/_base.txt +++ b/services/datcore-adapter/requirements/_base.txt @@ -269,7 +269,7 @@ protobuf==4.25.4 # opentelemetry-proto psutil==6.0.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -300,7 +300,7 @@ pydantic==2.9.2 # fastapi-pagination # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -365,7 +365,6 @@ redis==5.0.4 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -420,7 +419,7 @@ typer==0.12.3 # -r requirements/../../../packages/settings-library/requirements/_base.in types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -464,6 +463,7 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.9.4 # via + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/datcore-adapter/requirements/_test.txt b/services/datcore-adapter/requirements/_test.txt index 3ab05285f93..2e103070279 100644 --- a/services/datcore-adapter/requirements/_test.txt +++ b/services/datcore-adapter/requirements/_test.txt @@ -118,7 +118,7 @@ types-botocore==1.0.2 # via -r requirements/_test.in types-s3transfer==0.10.2 # via boto3-stubs -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # boto3-stubs diff --git a/services/datcore-adapter/requirements/_tools.txt b/services/datcore-adapter/requirements/_tools.txt index 190dca86c7e..51dcbdba67d 100644 --- a/services/datcore-adapter/requirements/_tools.txt +++ b/services/datcore-adapter/requirements/_tools.txt @@ -73,7 +73,7 @@ setuptools==74.0.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index 15a4e37ffc5..8bf3904e4a7 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -583,7 +583,7 @@ psycopg2-binary==2.9.9 # via # aiopg # sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # 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 @@ -657,7 +657,7 @@ pydantic==2.9.2 # fastapi # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.10.0 # via @@ -801,8 +801,6 @@ redis==5.0.4 # aiocache referencing==0.29.3 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -955,7 +953,7 @@ typer==0.12.3 # fastapi-cli types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -1069,7 +1067,9 @@ wsproto==1.2.0 yarl==1.9.4 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index ee97fe23500..216516825f2 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -316,7 +316,7 @@ types-psycopg2==2.9.21.20240819 # via -r requirements/_test.in types-pyyaml==6.0.12.20240917 # via -r requirements/_test.in -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # alembic diff --git a/services/director-v2/requirements/_tools.txt b/services/director-v2/requirements/_tools.txt index 8f148883b9c..9588b0ee960 100644 --- a/services/director-v2/requirements/_tools.txt +++ b/services/director-v2/requirements/_tools.txt @@ -79,7 +79,7 @@ setuptools==74.0.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/director/requirements/_base.txt b/services/director/requirements/_base.txt index 656861c1ba1..7246c36506e 100644 --- a/services/director/requirements/_base.txt +++ b/services/director/requirements/_base.txt @@ -292,7 +292,7 @@ protobuf==5.28.3 # opentelemetry-proto psutil==6.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -322,7 +322,7 @@ pydantic==2.9.2 # fastapi # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.10.0 # via @@ -388,7 +388,6 @@ redis==5.2.0 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -501,6 +500,7 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.17.1 # via + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/efs-guardian/requirements/_base.txt b/services/efs-guardian/requirements/_base.txt index f0ac604d836..86b839b2a73 100644 --- a/services/efs-guardian/requirements/_base.txt +++ b/services/efs-guardian/requirements/_base.txt @@ -418,7 +418,7 @@ psutil==6.1.0 # -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.10 # via sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # 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 @@ -475,7 +475,7 @@ pydantic==2.9.2 # fastapi # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -580,8 +580,6 @@ redis==5.1.1 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/./constraints.txt - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -758,7 +756,9 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.15.4 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/efs-guardian/requirements/_test.txt b/services/efs-guardian/requirements/_test.txt index c2b186a1310..364a52d87ae 100644 --- a/services/efs-guardian/requirements/_test.txt +++ b/services/efs-guardian/requirements/_test.txt @@ -212,12 +212,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic diff --git a/services/osparc-gateway-server/requirements/_base.txt b/services/osparc-gateway-server/requirements/_base.txt index c6689413bb4..8c5b436ae97 100644 --- a/services/osparc-gateway-server/requirements/_base.txt +++ b/services/osparc-gateway-server/requirements/_base.txt @@ -43,12 +43,12 @@ multidict==6.0.5 # yarl pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-settings==2.6.1 # via -r requirements/_base.in diff --git a/services/resource-usage-tracker/requirements/_base.txt b/services/resource-usage-tracker/requirements/_base.txt index 0f0c9c3592e..f43ddb3ab58 100644 --- a/services/resource-usage-tracker/requirements/_base.txt +++ b/services/resource-usage-tracker/requirements/_base.txt @@ -446,7 +446,7 @@ psutil==6.0.0 # -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # 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 @@ -503,7 +503,7 @@ pydantic==2.9.2 # fastapi # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -620,8 +620,6 @@ redis==5.0.4 # -r requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/./constraints.txt - # -c requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications regex==2023.12.25 @@ -752,7 +750,7 @@ types-awscrt==0.20.5 # via botocore-stubs types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -819,7 +817,9 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.9.4 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/resource-usage-tracker/requirements/_test.txt b/services/resource-usage-tracker/requirements/_test.txt index 484ce4158da..2e7590de3f6 100644 --- a/services/resource-usage-tracker/requirements/_test.txt +++ b/services/resource-usage-tracker/requirements/_test.txt @@ -186,12 +186,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic @@ -308,7 +308,7 @@ termcolor==2.4.0 # via pytest-sugar types-requests==2.32.0.20240914 # via -r requirements/_test.in -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # alembic diff --git a/services/resource-usage-tracker/requirements/_tools.txt b/services/resource-usage-tracker/requirements/_tools.txt index 6565ecfab1f..6e0b433d1ed 100644 --- a/services/resource-usage-tracker/requirements/_tools.txt +++ b/services/resource-usage-tracker/requirements/_tools.txt @@ -80,7 +80,7 @@ setuptools==74.0.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index a3513a00a8f..d914e2d9dca 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -416,7 +416,7 @@ psycopg2-binary==2.9.9 # via # aiopg # sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # 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 @@ -472,7 +472,7 @@ pydantic==2.9.2 # fast-depends # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -674,7 +674,7 @@ types-awscrt==0.20.5 # via botocore-stubs types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -761,7 +761,9 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.9.4 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt index 4d1791cf9e2..6b7dbd281bb 100644 --- a/services/storage/requirements/_test.txt +++ b/services/storage/requirements/_test.txt @@ -189,12 +189,12 @@ py-partiql-parser==0.5.6 # via moto pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aws-sam-translator -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via # -c requirements/_base.txt # pydantic @@ -312,7 +312,7 @@ termcolor==2.4.0 # via pytest-sugar types-aiofiles==24.1.0.20240626 # via -r requirements/_test.in -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # aws-sam-translator diff --git a/services/storage/requirements/_tools.txt b/services/storage/requirements/_tools.txt index 6565ecfab1f..6e0b433d1ed 100644 --- a/services/storage/requirements/_tools.txt +++ b/services/storage/requirements/_tools.txt @@ -80,7 +80,7 @@ setuptools==74.0.0 # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index 11bc97fb4bb..b254f64bb92 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -495,7 +495,7 @@ pycountry==23.12.11 # via -r requirements/_base.in pycparser==2.21 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -557,7 +557,7 @@ pydantic==2.9.2 # fast-depends # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -765,7 +765,7 @@ typer==0.12.3 # -r requirements/../../../../packages/settings-library/requirements/_base.in # -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in -typing-extensions==4.12.0 +typing-extensions==4.12.2 # via # aiodebug # aiodocker @@ -854,7 +854,9 @@ yarl==1.9.4 # via # -c requirements/./constraints.txt # -r requirements/../../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../../packages/service-library/requirements/_base.in # -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq diff --git a/services/web/server/requirements/_test.txt b/services/web/server/requirements/_test.txt index 6ac8bbec1e1..a62c8fcff02 100644 --- a/services/web/server/requirements/_test.txt +++ b/services/web/server/requirements/_test.txt @@ -224,7 +224,7 @@ types-passlib==1.7.7.20240819 # via -r requirements/_test.in types-pyyaml==6.0.12.20240917 # via -r requirements/_test.in -typing-extensions==4.12.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # asyncpg-stubs diff --git a/services/web/server/requirements/_tools.txt b/services/web/server/requirements/_tools.txt index 2ce86b62830..69df0c7072e 100644 --- a/services/web/server/requirements/_tools.txt +++ b/services/web/server/requirements/_tools.txt @@ -85,7 +85,7 @@ tomlkit==0.13.2 # via pylint types-cachetools==5.5.0.20240820 # via -r requirements/_tools.in -typing-extensions==4.12.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/tests/e2e-playwright/requirements/_test.txt b/tests/e2e-playwright/requirements/_test.txt index 011cb6fbd7c..35804a9691d 100644 --- a/tests/e2e-playwright/requirements/_test.txt +++ b/tests/e2e-playwright/requirements/_test.txt @@ -1,15 +1,9 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile _test.in -# annotated-types==0.7.0 # via pydantic anyio==4.6.2.post1 # via httpx arrow==1.3.0 - # via -r _test.in + # via -r requirements/_test.in certifi==2024.8.30 # via # httpcore @@ -20,11 +14,11 @@ charset-normalizer==3.3.2 dnspython==2.6.1 # via email-validator docker==7.1.0 - # via -r _test.in + # via -r requirements/_test.in email-validator==2.2.0 # via pydantic faker==29.0.0 - # via -r _test.in + # via -r requirements/_test.in greenlet==3.0.3 # via playwright h11==0.14.0 @@ -32,7 +26,7 @@ h11==0.14.0 httpcore==1.0.7 # via httpx httpx==0.27.2 - # via -r _test.in + # via -r requirements/_test.in idna==3.10 # via # anyio @@ -53,9 +47,9 @@ playwright==1.47.0 # via pytest-playwright pluggy==1.5.0 # via pytest -pydantic[email]==2.9.2 - # via -r _test.in -pydantic-core==2.23.4 +pydantic==2.10.2 + # via -r requirements/_test.in +pydantic-core==2.27.1 # via pydantic pyee==12.0.0 # via playwright @@ -70,17 +64,17 @@ pytest==8.3.3 pytest-base-url==2.1.0 # via pytest-playwright pytest-html==4.1.1 - # via -r _test.in + # via -r requirements/_test.in pytest-instafail==0.5.0 - # via -r _test.in + # via -r requirements/_test.in pytest-metadata==3.1.1 # via pytest-html pytest-playwright==0.5.2 - # via -r _test.in + # via -r requirements/_test.in pytest-runner==6.0.1 - # via -r _test.in + # via -r requirements/_test.in pytest-sugar==1.0.0 - # via -r _test.in + # via -r requirements/_test.in python-dateutil==2.9.0.post0 # via # arrow @@ -88,7 +82,7 @@ python-dateutil==2.9.0.post0 python-slugify==8.0.4 # via pytest-playwright pyyaml==6.0.2 - # via -r _test.in + # via -r requirements/_test.in requests==2.32.3 # via # docker @@ -100,7 +94,7 @@ sniffio==1.3.1 # anyio # httpx tenacity==9.0.0 - # via -r _test.in + # via -r requirements/_test.in termcolor==2.4.0 # via pytest-sugar text-unidecode==1.3 diff --git a/tests/environment-setup/requirements/requirements.txt b/tests/environment-setup/requirements/requirements.txt index 9703160dd63..b05f465df0c 100644 --- a/tests/environment-setup/requirements/requirements.txt +++ b/tests/environment-setup/requirements/requirements.txt @@ -8,7 +8,7 @@ packaging==24.1 # pytest-sugar pluggy==1.5.0 # via pytest -pydantic==2.9.2 +pydantic==2.10.2 # via # -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 @@ -20,7 +20,7 @@ pydantic==2.9.2 # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/requirements.in -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pytest==8.3.3 # via diff --git a/tests/public-api/requirements/_base.txt b/tests/public-api/requirements/_base.txt index 753d75bafbe..97b4580a397 100644 --- a/tests/public-api/requirements/_base.txt +++ b/tests/public-api/requirements/_base.txt @@ -41,7 +41,7 @@ osparc-client==0.6.6 # via osparc packaging==24.1 # via osparc -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt @@ -49,7 +49,7 @@ pydantic==2.9.2 # -r requirements/../../../packages/settings-library/requirements/_base.in # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.10.0 # via -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt index 881b9db0ba3..8cef298a526 100644 --- a/tests/swarm-deploy/requirements/_test.txt +++ b/tests/swarm-deploy/requirements/_test.txt @@ -363,7 +363,7 @@ psycopg2-binary==2.9.9 # via # aiopg # sqlalchemy -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt @@ -417,7 +417,7 @@ pydantic==2.9.2 # fast-depends # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic pydantic-extra-types==2.9.0 # via @@ -565,8 +565,6 @@ redis==5.0.4 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in referencing==0.29.3 # via - # -c requirements/../../../packages/service-library/requirements/./constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt # jsonschema # jsonschema-specifications repro-zipfile==0.3.1 @@ -707,7 +705,9 @@ wrapt==1.16.0 # opentelemetry-instrumentation-redis yarl==1.12.1 # via + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq From 6711e2d07d69d035f1f31a7b968ddac1d7432c8a Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:42:38 +0100 Subject: [PATCH 10/15] updates catalog --- services/catalog/requirements/_base.txt | 56 +++++++++++++----------- services/catalog/requirements/_test.txt | 22 +++++----- services/catalog/requirements/_tools.txt | 4 +- 3 files changed, 43 insertions(+), 39 deletions(-) diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index 0e0c9626e55..8280326f2f4 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -1,4 +1,4 @@ -aio-pika==9.5.1 +aio-pika==9.5.3 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.3 # via @@ -10,9 +10,9 @@ aiodocker==0.24.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiofiles==24.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.4 # via aiohttp -aiohttp==3.11.8 +aiohttp==3.11.10 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -37,7 +37,7 @@ alembic==1.14.0 # via -r requirements/../../../packages/postgres-database/requirements/_base.in annotated-types==0.7.0 # via pydantic -anyio==4.6.2.post1 +anyio==4.7.0 # via # fast-depends # faststream @@ -83,6 +83,7 @@ charset-normalizer==3.4.0 # via requests click==8.1.7 # via + # rich-toolkit # typer # uvicorn deprecated==1.2.15 @@ -101,13 +102,13 @@ exceptiongroup==1.2.2 # via aio-pika fast-depends==2.4.12 # via faststream -fastapi==0.115.5 +fastapi==0.115.6 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in -fastapi-cli==0.0.5 +fastapi-cli==0.0.6 # via fastapi -faststream==0.5.31 +faststream==0.5.33 # via -r requirements/../../../packages/service-library/requirements/_base.in frozenlist==1.5.0 # via @@ -119,7 +120,7 @@ googleapis-common-protos==1.66.0 # opentelemetry-exporter-otlp-proto-http greenlet==3.1.1 # via sqlalchemy -grpcio==1.68.0 +grpcio==1.68.1 # via opentelemetry-exporter-otlp-proto-grpc h11==0.14.0 # via @@ -129,7 +130,7 @@ httpcore==1.0.7 # via httpx httptools==0.6.4 # via uvicorn -httpx==0.27.2 +httpx==0.28.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -182,7 +183,7 @@ jsonschema==4.23.0 # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in jsonschema-specifications==2024.10.1 # via jsonschema -mako==1.3.6 +mako==1.3.7 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -255,9 +256,9 @@ opentelemetry-instrumentation-fastapi==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in opentelemetry-instrumentation-httpx==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -opentelemetry-instrumentation-logging==0.48b0 +opentelemetry-instrumentation-logging==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-instrumentation-redis==0.48b0 +opentelemetry-instrumentation-redis==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_base.in opentelemetry-instrumentation-requests==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_base.in @@ -319,17 +320,17 @@ packaging==24.2 # opentelemetry-instrumentation pamqp==3.3.0 # via aiormq -prometheus-client==0.21.0 +prometheus-client==0.21.1 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # prometheus-fastapi-instrumentator prometheus-fastapi-instrumentator==7.0.0 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -propcache==0.2.0 +propcache==0.2.1 # via # aiohttp # yarl -protobuf==5.29.0 +protobuf==5.29.1 # via # googleapis-common-protos # opentelemetry-proto @@ -337,7 +338,7 @@ psutil==6.1.0 # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.10 # via sqlalchemy -pydantic==2.10.2 +pydantic==2.10.3 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -402,7 +403,7 @@ python-dotenv==1.0.1 # via # pydantic-settings # uvicorn -python-multipart==0.0.17 +python-multipart==0.0.19 # via fastapi pyyaml==6.0.2 # via @@ -424,7 +425,7 @@ pyyaml==6.0.2 # -r requirements/_base.in # fastapi # uvicorn -redis==5.2.0 +redis==5.2.1 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -454,19 +455,20 @@ rich==13.9.4 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in + # rich-toolkit # typer -rpds-py==0.21.0 +rich-toolkit==0.12.0 + # via fastapi-cli +rpds-py==0.22.3 # via # jsonschema # referencing shellingham==1.5.4 # via typer -six==1.16.0 +six==1.17.0 # via python-dateutil sniffio==1.3.1 - # via - # anyio - # httpx + # via anyio sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -511,23 +513,25 @@ toolz==1.0.0 # via -r requirements/../../../packages/service-library/requirements/_base.in tqdm==4.67.1 # via -r requirements/../../../packages/service-library/requirements/_base.in -typer==0.13.1 +typer==0.15.1 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in # fastapi-cli -types-python-dateutil==2.9.0.20241003 +types-python-dateutil==2.9.0.20241206 # via arrow typing-extensions==4.12.2 # via # aiodebug # alembic + # anyio # fastapi # faststream # opentelemetry-sdk # pydantic # pydantic-core # pydantic-extra-types + # rich-toolkit # typer ujson==5.10.0 # via @@ -580,7 +584,7 @@ wrapt==1.17.0 # opentelemetry-instrumentation # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-redis -yarl==1.18.0 +yarl==1.18.3 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index 33af4b296b9..b5061726829 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -1,8 +1,8 @@ -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.4 # via # -c requirements/_base.txt # aiohttp -aiohttp==3.11.8 +aiohttp==3.11.10 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -15,7 +15,7 @@ alembic==1.14.0 # via # -c requirements/_base.txt # -r requirements/_test.in -anyio==4.6.2.post1 +anyio==4.7.0 # via # -c requirements/_base.txt # httpx @@ -66,7 +66,7 @@ httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.27.2 +httpx==0.28.0 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -88,7 +88,7 @@ jsonschema-specifications==2024.10.1 # via # -c requirements/_base.txt # jsonschema -mako==1.3.6 +mako==1.3.7 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -112,7 +112,7 @@ packaging==24.2 # pytest pluggy==1.5.0 # via pytest -propcache==0.2.0 +propcache==0.2.1 # via # -c requirements/_base.txt # aiohttp @@ -121,7 +121,7 @@ ptvsd==4.3.2 # via -r requirements/_test.in py-cpuinfo==9.0.0 # via pytest-benchmark -pytest==8.3.3 +pytest==8.3.4 # via # -r requirements/_test.in # pytest-aiohttp @@ -161,12 +161,12 @@ requests==2.32.3 # docker respx==0.21.1 # via -r requirements/_test.in -rpds-py==0.21.0 +rpds-py==0.22.3 # via # -c requirements/_base.txt # jsonschema # referencing -six==1.16.0 +six==1.17.0 # via # -c requirements/_base.txt # python-dateutil @@ -175,7 +175,6 @@ sniffio==1.3.1 # -c requirements/_base.txt # anyio # asgi-lifespan - # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt @@ -192,6 +191,7 @@ typing-extensions==4.12.2 # via # -c requirements/_base.txt # alembic + # anyio # faker # mypy # sqlalchemy2-stubs @@ -201,7 +201,7 @@ urllib3==2.2.3 # -c requirements/_base.txt # docker # requests -yarl==1.18.0 +yarl==1.18.3 # via # -c requirements/_base.txt # aiohttp diff --git a/services/catalog/requirements/_tools.txt b/services/catalog/requirements/_tools.txt index 032737dadc0..068ef00e722 100644 --- a/services/catalog/requirements/_tools.txt +++ b/services/catalog/requirements/_tools.txt @@ -58,7 +58,7 @@ platformdirs==4.3.6 # virtualenv pre-commit==4.0.1 # via -r requirements/../../../requirements/devenv.txt -pylint==3.3.1 +pylint==3.3.2 # via -r requirements/../../../requirements/devenv.txt pyproject-hooks==1.2.0 # via @@ -69,7 +69,7 @@ pyyaml==6.0.2 # -c requirements/_base.txt # pre-commit # watchdog -ruff==0.8.0 +ruff==0.8.2 # via -r requirements/../../../requirements/devenv.txt setuptools==75.6.0 # via pip-tools From 4f0345b2958461483a2e794ded1de6ed9f721372 Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:51:15 +0100 Subject: [PATCH 11/15] minor --- services/catalog/tests/unit/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/catalog/tests/unit/conftest.py b/services/catalog/tests/unit/conftest.py index 184acf22a68..0bf1cc74f01 100644 --- a/services/catalog/tests/unit/conftest.py +++ b/services/catalog/tests/unit/conftest.py @@ -432,7 +432,7 @@ def _search(service_key, service_version): path__regex=r"^/services/(?P[/\w-]+)/(?P[0-9.]+)$", name="get_service", ) - def _get_service(request, service_key, service_version): + def _get_service(request: httpx.Request, service_key, service_version): if found := _search(service_key, service_version): # NOTE: this is a defect in director's API single_service_list = [found] From b7d431c8613e8d3f24804fa8c3a5c86f6eefdc8c Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:55:53 +0100 Subject: [PATCH 12/15] cleanup --- requirements/constraints.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 2d0bd685689..66204b2ee37 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -51,8 +51,6 @@ pytest-asyncio<0.24 # Compatibility/coordination ----------------------------------------------------------------------------------------- # -pydantic>=2.10.0 # _pickle.UnpicklingError: NEWOBJ class argument must be a type, not _AnnotatedAlias - pydantic>=2.10.0 # Avoids inter-version compatibility serialization errors as: _pickle.UnpicklingError: NEWOBJ class argument must be a type, not _AnnotatedAlias # constraint since https://github.com/MagicStack/uvloop/releases/tag/v0.15.0: drops support for 3.5/3.6 Feb.2021 From 09cabe9becacff0024774e1b3f191e3f78b19ce3 Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:13:17 +0100 Subject: [PATCH 13/15] updates constratings --- requirements/constraints.txt | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 66204b2ee37..e69dd19609f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -43,31 +43,15 @@ pytest-asyncio<0.24 # # Bugs # - +httpx<0.28 # Waiting for fix in respx: https://github.com/lundberg/respx/pull/278 # # Compatibility/coordination ----------------------------------------------------------------------------------------- # - pydantic>=2.10.0 # Avoids inter-version compatibility serialization errors as: _pickle.UnpicklingError: NEWOBJ class argument must be a type, not _AnnotatedAlias -# constraint since https://github.com/MagicStack/uvloop/releases/tag/v0.15.0: drops support for 3.5/3.6 Feb.2021 -uvloop<0.15.0 ; python_version < '3.7' - -# All backports libraries add environ markers -# NOTE: If >second dependency, this will annotate a marker in the compiled requirements file -# -async-exit-stack ; python_version < '3.7' -async-generator ; python_version < '3.7' -contextvars ; python_version < '3.7' -dataclasses ; python_version < '3.7' -importlib-metadata ; python_version < '3.8' -importlib-resources ; python_version < '3.9' -typing-extensions ; python_version < '3.7' -zipp ; python_version < '3.7' - # From 0d8e7108fe7d02020925a50eadf0e5c59e56c0ac Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:14:10 +0100 Subject: [PATCH 14/15] cleanup --- services/catalog/requirements/_base.txt | 6 ++++-- services/catalog/requirements/_test.txt | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index 8280326f2f4..04a30b02856 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -130,7 +130,7 @@ httpcore==1.0.7 # via httpx httptools==0.6.4 # via uvicorn -httpx==0.28.0 +httpx==0.27.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -468,7 +468,9 @@ shellingham==1.5.4 six==1.17.0 # via python-dateutil sniffio==1.3.1 - # via anyio + # via + # anyio + # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index b5061726829..f1182de0317 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -43,7 +43,7 @@ click==8.1.7 # via # -c requirements/_base.txt # -r requirements/_test.in -coverage==7.6.8 +coverage==7.6.9 # via pytest-cov docker==7.1.0 # via -r requirements/_test.in @@ -66,7 +66,7 @@ httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.28.0 +httpx==0.27.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -175,6 +175,7 @@ sniffio==1.3.1 # -c requirements/_base.txt # anyio # asgi-lifespan + # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt From c5efdc9771b09661526e140f93329cb2de93271b Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:08:47 +0100 Subject: [PATCH 15/15] @bisgaard-itis review: only avoid this version of httpx --- requirements/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e69dd19609f..8ed905d6b76 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -43,7 +43,7 @@ pytest-asyncio<0.24 # # Bugs # -httpx<0.28 # Waiting for fix in respx: https://github.com/lundberg/respx/pull/278 +httpx!=0.28.0 # Waiting for fix in respx: https://github.com/lundberg/respx/pull/278