⬆️ Upgrade to pip~=24.0 (#5320)

ITISFoundation · Feb 9, 2024 · a284681 · a284681
1 parent 4bfdd6c
commit a284681
Show file tree

Hide file tree

Showing 31 changed files with 101 additions and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -456,7 +456,7 @@ push-version: tag-version
 	python3 -m venv $@
 	## upgrading tools to latest version in $(shell python3 --version)
 	$@/bin/pip3 --quiet install --upgrade \
-		pip~=23.1 \
+		pip~=24.0 \
 		wheel \
 		setuptools
 	@$@/bin/pip3 list --verbose

diff --git a/api/specs/web-server/_admin.py b/api/specs/web-server/_admin.py
@@ -9,7 +9,11 @@
 from fastapi import APIRouter, Header
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.email._handlers import TestEmail, TestFailed, TestPassed
+from simcore_service_webserver.email._handlers import (
+    EmailTestFailed,
+    EmailTestPassed,
+    TestEmail,
+)
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
@@ -21,7 +25,7 @@
 
 @router.post(
     "/email:test",
-    response_model=Envelope[Union[TestFailed, TestPassed]],
+    response_model=Envelope[Union[EmailTestFailed, EmailTestPassed]],
 )
 async def test_email(
     _test: TestEmail, x_simcore_products_name: str | None = Header(default=None)

diff --git a/ci/helpers/ensure_python_pip.bash b/ci/helpers/ensure_python_pip.bash
@@ -11,7 +11,7 @@ set -o pipefail # don't hide errors within pipes
 IFS=$'\n\t'
 
 # Pin pip version to a compatible release https://www.python.org/dev/peps/pep-0440/#compatible-release
-PIP_VERSION=23.1
+PIP_VERSION=24.0
 
 echo "INFO:" "$(python --version)" "@" "$(command -v python)"
 

diff --git a/packages/postgres-database/docker/Dockerfile b/packages/postgres-database/docker/Dockerfile
@@ -28,7 +28,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/packages/postgres-database/scripts/erd/Dockerfile b/packages/postgres-database/scripts/erd/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update \
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/packages/service-integration/Dockerfile b/packages/service-integration/Dockerfile
@@ -54,7 +54,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/requirements/tools/Dockerfile b/requirements/tools/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update \
 # SEE bug with pip==22.1 https://github.com/jazzband/pip-tools/issues/1617
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/scripts/erd/Dockerfile b/scripts/erd/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update \
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/scripts/openapi/oas_resolver/Dockerfile b/scripts/openapi/oas_resolver/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR /src
 # update pip
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/scripts/pydeps-docker/Dockerfile b/scripts/pydeps-docker/Dockerfile
@@ -29,7 +29,7 @@ COPY .pydeps ${HOME_DIR}/.pydeps
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/agent/Dockerfile b/services/agent/Dockerfile
@@ -80,7 +80,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/api-server/Dockerfile b/services/api-server/Dockerfile
@@ -76,7 +76,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/autoscaling/Dockerfile b/services/autoscaling/Dockerfile
@@ -96,7 +96,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile
@@ -76,7 +76,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/clusters-keeper/Dockerfile b/services/clusters-keeper/Dockerfile
@@ -96,7 +96,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile
@@ -86,7 +86,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile
@@ -77,7 +77,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile
@@ -77,7 +77,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/dynamic-scheduler/Dockerfile b/services/dynamic-scheduler/Dockerfile
@@ -76,7 +76,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/dynamic-sidecar/Dockerfile b/services/dynamic-sidecar/Dockerfile
@@ -107,7 +107,7 @@ RUN python -m venv "${VIRTUAL_ENV}" \
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/invitations/Dockerfile b/services/invitations/Dockerfile
@@ -76,7 +76,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile
@@ -49,7 +49,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/osparc-gateway-server/Dockerfile b/services/osparc-gateway-server/Dockerfile
@@ -77,7 +77,7 @@ RUN  --mount=type=cache,target=/var/cache/apt,mode=0755,sharing=private \
 RUN python -m venv "${VIRTUAL_ENV}"
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/payments/Dockerfile b/services/payments/Dockerfile
@@ -76,7 +76,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/resource-usage-tracker/Dockerfile b/services/resource-usage-tracker/Dockerfile
@@ -77,7 +77,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile
@@ -85,7 +85,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/web/Dockerfile b/services/web/Dockerfile
@@ -88,7 +88,7 @@ RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
   pip install --upgrade  \
-  pip~=23.1  \
+  pip~=24.0  \
   wheel \
   setuptools
 

diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml
@@ -53,7 +53,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Envelope_Union_TestFailed__TestPassed__'
+                $ref: '#/components/schemas/Envelope_Union_EmailTestFailed__EmailTestPassed__'
   /v0/announcements:
     get:
       tags:
@@ -5407,6 +5407,40 @@ components:
       additionalProperties: false
       description: I/O port type to hold a generic download link to a file (e.g. S3
         pre-signed link, etc)
+    EmailTestFailed:
+      title: EmailTestFailed
+      required:
+      - test_name
+      - error_type
+      - error_message
+      - traceback
+      type: object
+      properties:
+        test_name:
+          title: Test Name
+          type: string
+        error_type:
+          title: Error Type
+          type: string
+        error_message:
+          title: Error Message
+          type: string
+        traceback:
+          title: Traceback
+          type: string
+    EmailTestPassed:
+      title: EmailTestPassed
+      required:
+      - fixtures
+      - info
+      type: object
+      properties:
+        fixtures:
+          title: Fixtures
+          type: object
+        info:
+          title: Info
+          type: object
     EmptyModel:
       title: EmptyModel
       type: object
@@ -5776,6 +5810,17 @@ components:
           $ref: '#/components/schemas/ThirdPartyToken'
         error:
           title: Error
+    Envelope_Union_EmailTestFailed__EmailTestPassed__:
+      title: Envelope[Union[EmailTestFailed, EmailTestPassed]]
+      type: object
+      properties:
+        data:
+          title: Data
+          anyOf:
+          - $ref: '#/components/schemas/EmailTestFailed'
+          - $ref: '#/components/schemas/EmailTestPassed'
+        error:
+          title: Error
     Envelope_Union_NodeGetIdle__NodeGetUnknown__RunningDynamicServiceDetails__NodeGet__:
       title: Envelope[Union[NodeGetIdle, NodeGetUnknown, RunningDynamicServiceDetails,
         NodeGet]]
@@ -5798,17 +5843,6 @@ components:
           $ref: '#/components/schemas/PricingUnitGet'
         error:
           title: Error
-    Envelope_Union_TestFailed__TestPassed__:
-      title: Envelope[Union[TestFailed, TestPassed]]
-      type: object
-      properties:
-        data:
-          title: Data
-          anyOf:
-          - $ref: '#/components/schemas/TestFailed'
-          - $ref: '#/components/schemas/TestPassed'
-        error:
-          title: Error
     Envelope_Union_WalletGet__NoneType__:
       title: Envelope[Union[WalletGet, NoneType]]
       type: object
@@ -9805,40 +9839,6 @@ components:
           title: Template Context
           type: object
           default: {}
-    TestFailed:
-      title: TestFailed
-      required:
-      - test_name
-      - error_type
-      - error_message
-      - traceback
-      type: object
-      properties:
-        test_name:
-          title: Test Name
-          type: string
-        error_type:
-          title: Error Type
-          type: string
-        error_message:
-          title: Error Message
-          type: string
-        traceback:
-          title: Traceback
-          type: string
-    TestPassed:
-      title: TestPassed
-      required:
-      - fixtures
-      - info
-      type: object
-      properties:
-        fixtures:
-          title: Fixtures
-          type: object
-        info:
-          title: Info
-          type: object
     TextArea:
       title: TextArea
       required: