From 416813ac7b50f67895c0465ea548895ac2cfde58 Mon Sep 17 00:00:00 2001 From: Mourits de Beer <31511766+ff137@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:13:23 +0200 Subject: [PATCH] :arrow_up: Upgrade pydantic and cloudcontroller (#733) * :arrow_up: Upgrade `pydantic` to latest * :arrow_up: Upgrade `typing-extensions` to latest * :arrow_up: Upgrade `anyio` to latest * :construction_worker: add `--upgrade` flag to pip install * :heavy_minus_sign: drop unnecessary requirement for starlette * :arrow_up: use latest cloudcontroller, with `validate_call` re-added --- .github/workflows/continuous-deploy.yml | 4 ++-- app/requirements.txt | 6 +++--- dockerfiles/endorser/Dockerfile | 2 +- dockerfiles/fastapi/Dockerfile | 2 +- dockerfiles/tests/Dockerfile | 2 +- dockerfiles/trustregistry/Dockerfile | 2 +- dockerfiles/webhooks/Dockerfile | 2 +- endorser/requirements.txt | 4 ++-- requirements.dev.txt | 2 +- trustregistry/requirements.txt | 3 +-- webhooks/requirements.txt | 7 +++---- 11 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/continuous-deploy.yml b/.github/workflows/continuous-deploy.yml index cbe7bca0e..b0b4b9d2e 100644 --- a/.github/workflows/continuous-deploy.yml +++ b/.github/workflows/continuous-deploy.yml @@ -158,7 +158,7 @@ jobs: - name: Install test dependencies. run: | python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements.txt --upgrade - name: Run Pylint run: | pylint app/ endorser/ shared/ trustregistry/ webhooks/ --rcfile=.pylintrc -r n --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" --exit-zero > pylintreport.txt @@ -195,7 +195,7 @@ jobs: - name: Install test dependencies. run: | python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements.txt --upgrade - uses: docker/login-action@v3 with: registry: ghcr.io diff --git a/app/requirements.txt b/app/requirements.txt index dc61f7e26..1c08869d5 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,13 +1,13 @@ aiohttp~=3.9.0 -aries-cloudcontroller==0.11.0.post0 +aries-cloudcontroller==0.11.0.post3 base58~=2.1.1 fastapi~=0.110.0 fastapi_websocket_pubsub~=0.3.8 httpx~=0.27.0 loguru~=0.7.2 orjson~=3.9.15 -pydantic~=2.5.1 +pydantic~=2.6.4 pyjwt~=2.8.0 PyYAML~=6.0 -typing-extensions~=4.9.0 +typing-extensions~=4.10.0 uvicorn[standard]~=0.29.0 diff --git a/dockerfiles/endorser/Dockerfile b/dockerfiles/endorser/Dockerfile index 8786b9879..191eba286 100644 --- a/dockerfiles/endorser/Dockerfile +++ b/dockerfiles/endorser/Dockerfile @@ -5,7 +5,7 @@ COPY shared /shared WORKDIR /endorser -RUN pip install --no-cache-dir -r requirements.txt -r requirements.dev.txt +RUN pip install --no-cache-dir -r requirements.txt -r requirements.dev.txt --upgrade EXPOSE 3009 diff --git a/dockerfiles/fastapi/Dockerfile b/dockerfiles/fastapi/Dockerfile index c2bb99979..cc8dad371 100644 --- a/dockerfiles/fastapi/Dockerfile +++ b/dockerfiles/fastapi/Dockerfile @@ -5,7 +5,7 @@ COPY shared /shared WORKDIR /app -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt --upgrade EXPOSE 8000 diff --git a/dockerfiles/tests/Dockerfile b/dockerfiles/tests/Dockerfile index 12f2e6369..3d345c3e2 100644 --- a/dockerfiles/tests/Dockerfile +++ b/dockerfiles/tests/Dockerfile @@ -9,7 +9,7 @@ COPY endorser/requirements.txt endorser/ COPY trustregistry/requirements.txt trustregistry/ COPY webhooks/requirements.txt webhooks/ -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt --upgrade COPY . . diff --git a/dockerfiles/trustregistry/Dockerfile b/dockerfiles/trustregistry/Dockerfile index 40f745ca9..9ac433d54 100644 --- a/dockerfiles/trustregistry/Dockerfile +++ b/dockerfiles/trustregistry/Dockerfile @@ -5,7 +5,7 @@ COPY shared /shared WORKDIR /trustregistry -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt --upgrade EXPOSE 8001 diff --git a/dockerfiles/webhooks/Dockerfile b/dockerfiles/webhooks/Dockerfile index c57ba0fde..7649736bd 100644 --- a/dockerfiles/webhooks/Dockerfile +++ b/dockerfiles/webhooks/Dockerfile @@ -5,7 +5,7 @@ COPY shared /shared WORKDIR /webhooks -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt --upgrade EXPOSE 3010 diff --git a/endorser/requirements.txt b/endorser/requirements.txt index 176719acf..1cf86e5a1 100644 --- a/endorser/requirements.txt +++ b/endorser/requirements.txt @@ -1,9 +1,9 @@ -aries-cloudcontroller==0.11.0.post0 +aries-cloudcontroller==0.11.0.post3 dependency-injector~=4.41.0 httpx~=0.27.0 fastapi~=0.110.0 loguru~=0.7.2 orjson~=3.9.15 -pydantic~=2.5.1 +pydantic~=2.6.4 redis~=5.1.0b4 uvicorn[standard]~=0.29.0 diff --git a/requirements.dev.txt b/requirements.dev.txt index 3c5f5a895..c6e27bcc2 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,4 +1,4 @@ -anyio>=3.7.1 +anyio~=4.3.0 assertpy==1.1 black~=24.3.0 isort~=5.13.2 diff --git a/trustregistry/requirements.txt b/trustregistry/requirements.txt index a8124243d..3b06bed6a 100644 --- a/trustregistry/requirements.txt +++ b/trustregistry/requirements.txt @@ -3,7 +3,6 @@ httpx~=0.27.0 loguru~=0.7.2 orjson~=3.9.15 psycopg2-binary~=2.9.6 -pydantic~=2.5.1 +pydantic~=2.6.4 sqlalchemy~=2.0.19 -starlette>=0.27.0 uvicorn[standard]~=0.29.0 diff --git a/webhooks/requirements.txt b/webhooks/requirements.txt index 6aa9e8803..c88afd73e 100644 --- a/webhooks/requirements.txt +++ b/webhooks/requirements.txt @@ -1,13 +1,12 @@ -aries-cloudcontroller==0.11.0.post0 +aries-cloudcontroller==0.11.0.post3 dependency-injector~=4.41.0 fastapi~=0.110.0 fastapi_websocket_pubsub~=0.3.8 httpx~=0.27.0 loguru~=0.7.2 orjson~=3.9.15 -pydantic~=2.5.1 +pydantic~=2.6.4 redis~=5.1.0b4 sse-starlette~=2.0.0 -starlette>=0.27.0 -typing-extensions~=4.9.0 +typing-extensions~=4.10.0 uvicorn[standard]~=0.29.0