Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Upgrade to pip~=24.0 #5320

Merged
merged 5 commits into from
Feb 9, 2024
Merged

⬆️ Upgrade to pip~=24.0 #5320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c4aac1
Upgrade to pip~=24.0
pcrespov Feb 8, 2024
78a16a9
cleanup
pcrespov Feb 8, 2024
b996aea
Fixes
pcrespov Feb 8, 2024
cb2d389
updates OAS
pcrespov Feb 8, 2024
94bd0c2
Merge branch 'master' into maintenance/pip-upgrade
pcrespov Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions api/specs/web-server/_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ci/helpers/ensure_python_pip.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
2 changes: 1 addition & 1 deletion packages/postgres-database/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/postgres-database/scripts/erd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/service-integration/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion requirements/tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/erd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/openapi/oas_resolver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/pydeps-docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/api-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/autoscaling/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/catalog/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/clusters-keeper/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/dask-sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/datcore-adapter/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/director-v2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-scheduler/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/invitations/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/migration/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/osparc-gateway-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/payments/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/resource-usage-tracker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/storage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
92 changes: 46 additions & 46 deletions services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]]
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading
Loading