From c87d590c52c006321b890711dcb606f9ac8d2342 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:00:50 +0200 Subject: [PATCH] full upgrade --- services/director-v2/requirements/_base.txt | 138 ++++++++++--------- services/director-v2/requirements/_test.txt | 70 +++++----- services/director-v2/requirements/_tools.txt | 18 +-- 3 files changed, 119 insertions(+), 107 deletions(-) diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index 1f81fe378ce1..6efc07534c50 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -4,13 +4,13 @@ # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in # -aio-pika==9.1.2 +aio-pika==9.1.4 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in -aiocache==0.11.1 +aiocache==0.12.1 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in @@ -19,19 +19,19 @@ aiodebug==2.3.0 # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -aiodocker==0.19.1 +aiodocker==0.21.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in -aiofiles==0.8.0 +aiofiles==23.1.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in -aiohttp==3.8.3 +aiohttp==3.8.4 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -59,21 +59,19 @@ aiopg==1.4.0 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -aioredis==2.0.1 - # via aiocache aiormq==6.7.6 # via aio-pika -aiosignal==1.2.0 +aiosignal==1.3.1 # via aiohttp -alembic==1.8.1 +alembic==1.11.1 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in -anyio==3.6.2 +anyio==3.7.1 # via # httpcore # starlette - # watchgod + # watchfiles arrow==1.2.3 # via # -c requirements/../../../packages/service-library/requirements/./_base.in @@ -85,27 +83,25 @@ arrow==1.2.3 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -asgiref==3.5.2 - # via uvicorn async-timeout==4.0.2 # via # aiohttp # aiopg - # aioredis # redis asyncpg==0.28.0 # via sqlalchemy -attrs==21.4.0 +attrs==23.1.0 # via # aiohttp # jsonschema + # referencing blosc==1.11.1 # via -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt -certifi==2022.12.7 +certifi==2023.5.7 # via # httpcore # httpx -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via aiohttp click==8.1.3 # via @@ -120,8 +116,6 @@ cloudpickle==2.2.1 # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # dask # distributed -commonmark==0.9.1 - # via rich dask==2023.3.2 # via # -r requirements/../../../packages/dask-task-models-library/requirements/_base.in @@ -130,20 +124,20 @@ dask==2023.3.2 # distributed dask-gateway==2023.1.1 # via -r requirements/_base.in -decorator==4.4.2 - # via networkx distributed==2023.3.2 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # dask # dask-gateway -dnspython==2.1.0 +dnspython==2.4.0 # via email-validator -email-validator==1.2.1 +email-validator==2.0.0.post2 # via # fastapi # pydantic -fastapi==0.98.0 +exceptiongroup==1.1.2 + # via anyio +fastapi==0.99.1 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -166,7 +160,7 @@ fastapi==0.98.0 # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in -frozenlist==1.3.0 +frozenlist==1.4.0 # via # aiohttp # aiosignal @@ -176,15 +170,17 @@ fsspec==2023.5.0 # dask greenlet==2.0.2 # via sqlalchemy -h11==0.12.0 +h11==0.14.0 # via # httpcore # uvicorn -httpcore==0.15.0 - # via httpx -httptools==0.2.0 +httpcore==0.17.3 + # via + # dnspython + # httpx +httptools==0.6.0 # via uvicorn -httpx==0.24.0 +httpx==0.24.1 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -208,7 +204,7 @@ httpx==0.24.0 # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in # fastapi -idna==2.10 +idna==3.4 # via # anyio # email-validator @@ -218,7 +214,7 @@ importlib-metadata==6.6.0 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # dask -itsdangerous==1.1.0 +itsdangerous==2.1.2 # via fastapi jinja2==3.1.2 # via @@ -244,7 +240,7 @@ jinja2==3.1.2 # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed # fastapi -jsonschema==3.2.0 +jsonschema==4.18.4 # via # -r requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in @@ -252,6 +248,8 @@ jsonschema==3.2.0 # -r requirements/../../../packages/service-library/requirements/./../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in +jsonschema-specifications==2023.7.1 + # via jsonschema locket==1.0.0 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt @@ -259,7 +257,7 @@ locket==1.0.0 # partd lz4==4.3.2 # via -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt -mako==1.2.2 +mako==1.2.4 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -281,25 +279,29 @@ mako==1.2.2 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # alembic +markdown-it-py==3.0.0 + # via rich markupsafe==2.1.2 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # jinja2 # mako +mdurl==0.1.2 + # via markdown-it-py msgpack==1.0.5 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # aiocache # distributed -multidict==6.0.2 +multidict==6.0.4 # via # aiohttp # yarl -networkx==2.5.1 +networkx==3.1 # via -r requirements/_base.in ordered-set==4.1.0 # via -r requirements/_base.in -orjson==3.7.2 +orjson==3.9.2 # via # -r requirements/_base.in # fastapi @@ -315,7 +317,7 @@ partd==1.4.0 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # dask -pint==0.19.2 +pint==0.22 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in psutil==5.9.5 # via @@ -325,7 +327,7 @@ psycopg2-binary==2.9.6 # via # aiopg # sqlalchemy -pydantic==1.9.0 +pydantic==1.10.11 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -364,22 +366,20 @@ pydantic==1.9.0 # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in # fastapi -pygments==2.13.0 +pygments==2.15.1 # via rich -pyinstrument==4.1.1 +pyinstrument==4.5.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -pyrsistent==0.18.1 - # via jsonschema python-dateutil==2.8.2 # via arrow -python-dotenv==0.20.0 +python-dotenv==1.0.0 # via # pydantic # uvicorn -python-multipart==0.0.5 +python-multipart==0.0.6 # via fastapi pyyaml==6.0.1 # via @@ -411,7 +411,7 @@ pyyaml==6.0.1 # distributed # fastapi # uvicorn -redis==4.5.4 +redis==4.6.0 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -436,7 +436,12 @@ redis==4.5.4 # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in -rich==12.5.1 + # aiocache +referencing==0.30.0 + # via + # jsonschema + # jsonschema-specifications +rich==13.4.2 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/./../../../packages/settings-library/requirements/_base.in @@ -444,21 +449,23 @@ rich==12.5.1 # -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 # -r requirements/_base.in -six==1.15.0 +rpds-py==0.9.2 # via # jsonschema - # python-dateutil - # python-multipart -sniffio==1.2.0 + # referencing +six==1.16.0 + # via python-dateutil +sniffio==1.3.0 # via # anyio + # dnspython # httpcore # httpx sortedcontainers==2.4.0 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed -sqlalchemy==1.4.47 +sqlalchemy==1.4.49 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -509,7 +516,7 @@ tblib==1.7.0 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed -tenacity==8.0.1 +tenacity==8.2.2 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -527,26 +534,30 @@ tornado==6.3.2 # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # dask-gateway # distributed -tqdm==4.64.0 +tqdm==4.65.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in -typer==0.4.1 +typer==0.9.0 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/./../../../packages/settings-library/requirements/_base.in # -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.3.0 +typing-extensions==4.7.1 # via # aiodebug # aiodocker - # aioredis + # alembic + # fastapi + # pint # pydantic -ujson==5.5.0 + # typer + # uvicorn +ujson==5.8.0 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt @@ -591,15 +602,15 @@ urllib3==1.26.16 # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed -uvicorn==0.15.0 +uvicorn==0.23.1 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # fastapi -uvloop==0.16.0 +uvloop==0.17.0 # via uvicorn -watchgod==0.8.2 +watchfiles==0.19.0 # via uvicorn -websockets==10.1 +websockets==11.0.3 # via uvicorn yarl==1.9.2 # via @@ -616,6 +627,3 @@ zipp==3.15.0 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index b08b2f31289d..9df887eb3b02 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in # -aio-pika==9.1.2 +aio-pika==9.1.4 # via # -c requirements/_base.txt # -r requirements/_test.in @@ -12,7 +12,7 @@ aioboto3==11.2.0 # via -r requirements/_test.in aiobotocore==2.5.0 # via aioboto3 -aiohttp==3.8.3 +aiohttp==3.8.4 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -25,15 +25,15 @@ aiormq==6.7.6 # via # -c requirements/_base.txt # aio-pika -aiosignal==1.2.0 +aiosignal==1.3.1 # via # -c requirements/_base.txt # aiohttp -alembic==1.8.1 +alembic==1.11.1 # via # -c requirements/_base.txt # -r requirements/_test.in -anyio==3.6.2 +anyio==3.7.1 # via # -c requirements/_base.txt # httpcore @@ -45,7 +45,7 @@ async-timeout==4.0.2 # via # -c requirements/_base.txt # aiohttp -attrs==21.4.0 +attrs==23.1.0 # via # -c requirements/_base.txt # aiohttp @@ -59,7 +59,7 @@ botocore==1.29.76 # aiobotocore # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.5.7 # via # -c requirements/_base.txt # httpcore @@ -68,7 +68,7 @@ certifi==2022.12.7 # requests cffi==1.15.1 # via cryptography -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via # -c requirements/_base.txt # aiohttp @@ -87,7 +87,7 @@ colorlog==6.7.0 # via dask-gateway-server coverage==7.2.7 # via pytest-cov -cryptography==41.0.1 +cryptography==41.0.2 # via # -c requirements/../../../requirements/constraints.txt # dask-gateway-server @@ -104,15 +104,18 @@ distributed==2023.3.2 # dask docker==6.1.3 # via -r requirements/_test.in -exceptiongroup==1.1.1 - # via pytest -execnet==1.9.0 +exceptiongroup==1.1.2 + # via + # -c requirements/_base.txt + # anyio + # pytest +execnet==2.0.2 # via pytest-xdist -faker==18.10.1 +faker==19.1.0 # via -r requirements/_test.in flaky==3.7.0 # via -r requirements/_test.in -frozenlist==1.3.0 +frozenlist==1.4.0 # via # -c requirements/_base.txt # aiohttp @@ -125,22 +128,22 @@ greenlet==2.0.2 # via # -c requirements/_base.txt # sqlalchemy -h11==0.12.0 +h11==0.14.0 # via # -c requirements/_base.txt # httpcore -httpcore==0.15.0 +httpcore==0.17.3 # via # -c requirements/_base.txt # httpx -httpx==0.24.0 +httpx==0.24.1 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # respx icdiff==2.0.6 # via pytest-icdiff -idna==2.10 +idna==3.4 # via # -c requirements/_base.txt # anyio @@ -169,7 +172,7 @@ locket==1.0.0 # -c requirements/_base.txt # distributed # partd -mako==1.2.2 +mako==1.2.4 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -187,17 +190,17 @@ msgpack==1.0.5 # via # -c requirements/_base.txt # distributed -multidict==6.0.2 +multidict==6.0.4 # via # -c requirements/_base.txt # aiohttp # async-asgi-testclient # yarl -mypy==1.3.0 +mypy==1.4.1 # via sqlalchemy mypy-extensions==1.0.0 # via mypy -numpy==1.24.3 +numpy==1.25.1 # via bokeh packaging==23.1 # via @@ -215,9 +218,9 @@ partd==1.4.0 # via # -c requirements/_base.txt # dask -pillow==9.5.0 +pillow==10.0.0 # via bokeh -pluggy==1.0.0 +pluggy==1.2.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff @@ -227,7 +230,7 @@ psutil==5.9.5 # distributed pycparser==2.21 # via cffi -pytest==7.3.1 +pytest==7.4.0 # via # -r requirements/_test.in # pytest-aiohttp @@ -239,7 +242,7 @@ pytest==7.3.1 # pytest-xdist pytest-aiohttp==1.0.4 # via -r requirements/_test.in -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-aiohttp pytest-cov==4.1.0 # via -r requirements/_test.in @@ -247,7 +250,7 @@ pytest-docker==1.0.1 # via -r requirements/_test.in pytest-icdiff==0.6 # via -r requirements/_test.in -pytest-mock==3.10.0 +pytest-mock==3.11.1 # via -r requirements/_test.in pytest-runner==6.0.0 # via -r requirements/_test.in @@ -273,11 +276,11 @@ respx==0.20.1 # via -r requirements/_test.in s3transfer==0.6.1 # via boto3 -six==1.15.0 +six==1.16.0 # via # -c requirements/_base.txt # python-dateutil -sniffio==1.2.0 +sniffio==1.3.0 # via # -c requirements/_base.txt # anyio @@ -288,14 +291,14 @@ sortedcontainers==2.4.0 # via # -c requirements/_base.txt # distributed -sqlalchemy==1.4.47 +sqlalchemy==1.4.49 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # -r requirements/_test.in # alembic # dask-gateway-server -sqlalchemy2-stubs==0.0.2a34 +sqlalchemy2-stubs==0.0.2a35 # via sqlalchemy tblib==1.7.0 # via @@ -319,9 +322,10 @@ tornado==6.3.2 # distributed traitlets==5.9.0 # via dask-gateway-server -typing-extensions==4.3.0 +typing-extensions==4.7.1 # via # -c requirements/_base.txt + # alembic # bokeh # mypy # sqlalchemy2-stubs @@ -334,7 +338,7 @@ urllib3==1.26.16 # docker # minio # requests -websocket-client==1.5.2 +websocket-client==1.6.1 # via docker wrapt==1.15.0 # via aiobotocore diff --git a/services/director-v2/requirements/_tools.txt b/services/director-v2/requirements/_tools.txt index e5a2696c1a4c..b2c02ee2bd8b 100644 --- a/services/director-v2/requirements/_tools.txt +++ b/services/director-v2/requirements/_tools.txt @@ -4,9 +4,9 @@ # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in # -astroid==2.15.5 +astroid==2.15.6 # via pylint -black==23.3.0 +black==23.7.0 # via -r requirements/../../../requirements/devenv.txt build==0.10.0 # via pip-tools @@ -22,9 +22,9 @@ click==8.1.3 # pip-tools dill==0.3.6 # via pylint -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -filelock==3.12.0 +filelock==3.12.2 # via virtualenv identify==2.5.24 # via pre-commit @@ -50,14 +50,14 @@ packaging==23.1 # build pathspec==0.11.1 # via black -pip-tools==7.0.0 +pip-tools==7.1.0 # via -r requirements/../../../requirements/devenv.txt -platformdirs==3.5.1 +platformdirs==3.9.1 # via # black # pylint # virtualenv -pre-commit==3.3.2 +pre-commit==3.3.3 # via -r requirements/../../../requirements/devenv.txt pylint==2.17.4 # via -r requirements/../../../requirements/devenv.txt @@ -82,12 +82,12 @@ tomli==2.0.1 # pyproject-hooks tomlkit==0.11.8 # via pylint -typing-extensions==4.3.0 +typing-extensions==4.7.1 # via # -c requirements/_base.txt # -c requirements/_test.txt # astroid -virtualenv==20.23.0 +virtualenv==20.24.0 # via pre-commit watchdog==3.0.0 # via -r requirements/_tools.in