From 574937b935b208c3b150f81b0825bf3688dacec6 Mon Sep 17 00:00:00 2001 From: David Schall Date: Tue, 20 Aug 2024 12:33:23 +0200 Subject: [PATCH] Upgrade Python to 3.12 Signed-off-by: David Schall --- .github/workflows/e2e-aes.yml | 2 +- .github/workflows/e2e-auth.yml | 2 +- benchmarks/aes/docker/Dockerfile | 2 +- benchmarks/aes/docker/Dockerfile.Lambda | 2 +- .../{aws_lambda.txt => aws_lambda_requirements.txt} | 0 .../requirements/{common.txt => common_requirements.txt} | 4 ++-- benchmarks/auth/docker/Dockerfile | 2 +- benchmarks/auth/docker/Dockerfile.Lambda | 2 +- .../{aws_lambda.txt => aws_lambda_requirements.txt} | 0 .../requirements/{common.txt => common_requirements.txt} | 4 ++-- benchmarks/fibonacci/python/requirements.txt | 4 ++-- utils/base-images/Dockerfile | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename benchmarks/aes/python/requirements/{aws_lambda.txt => aws_lambda_requirements.txt} (100%) rename benchmarks/aes/python/requirements/{common.txt => common_requirements.txt} (89%) rename benchmarks/auth/python/requirements/{aws_lambda.txt => aws_lambda_requirements.txt} (100%) rename benchmarks/auth/python/requirements/{common.txt => common_requirements.txt} (89%) diff --git a/.github/workflows/e2e-aes.yml b/.github/workflows/e2e-aes.yml index d54238b37..79d968f1b 100644 --- a/.github/workflows/e2e-aes.yml +++ b/.github/workflows/e2e-aes.yml @@ -92,7 +92,7 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install wheel ez_setup setuptools GRPC_PYTHON_BUILD_SYSTEM_ZLIB=true - python3 -m pip install -r benchmarks/aes/python/requirements/common.txt + python3 -m pip install -r benchmarks/aes/python/requirements/common_requirements.txt python3 -m pip install -r runner/aws_lambda_scripts/requirements.txt - name: Setup go dependencies diff --git a/.github/workflows/e2e-auth.yml b/.github/workflows/e2e-auth.yml index a7c9175c1..c3022b6c9 100644 --- a/.github/workflows/e2e-auth.yml +++ b/.github/workflows/e2e-auth.yml @@ -92,7 +92,7 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install wheel ez_setup setuptools GRPC_PYTHON_BUILD_SYSTEM_ZLIB=true - python3 -m pip install -r benchmarks/auth/python/requirements/common.txt + python3 -m pip install -r benchmarks/auth/python/requirements/common_requirements.txt python3 -m pip install -r runner/aws_lambda_scripts/requirements.txt - name: Setup go dependencies diff --git a/benchmarks/aes/docker/Dockerfile b/benchmarks/aes/docker/Dockerfile index 436f7b33a..82f37cd2f 100644 --- a/benchmarks/aes/docker/Dockerfile +++ b/benchmarks/aes/docker/Dockerfile @@ -25,7 +25,7 @@ # Install gRPC and all other dependencies FROM vhiveease/python-slim:latest as aesPythonBuilder WORKDIR /py -COPY ./benchmarks/aes/python/requirements/common.txt ./requirements.txt +COPY ./benchmarks/aes/python/requirements/common_requirements.txt ./requirements.txt RUN pip3 install --user -r requirements.txt COPY ./utils/tracing/python/tracing.py ./ COPY ./benchmarks/aes/python/server.py ./ diff --git a/benchmarks/aes/docker/Dockerfile.Lambda b/benchmarks/aes/docker/Dockerfile.Lambda index bf088ccf3..271d39eb7 100644 --- a/benchmarks/aes/docker/Dockerfile.Lambda +++ b/benchmarks/aes/docker/Dockerfile.Lambda @@ -29,7 +29,7 @@ COPY ./benchmarks/aes/python/server.py ${LAMBDA_TASK_ROOT} # Install the function's dependencies using file requirements.txt # from your project folder. -COPY ./benchmarks/aes/python/requirements/aws_lambda.txt ./requirements.txt +COPY ./benchmarks/aes/python/requirements/aws_lambda_requirements.txt ./requirements.txt RUN pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}" # Set the CMD to handler diff --git a/benchmarks/aes/python/requirements/aws_lambda.txt b/benchmarks/aes/python/requirements/aws_lambda_requirements.txt similarity index 100% rename from benchmarks/aes/python/requirements/aws_lambda.txt rename to benchmarks/aes/python/requirements/aws_lambda_requirements.txt diff --git a/benchmarks/aes/python/requirements/common.txt b/benchmarks/aes/python/requirements/common_requirements.txt similarity index 89% rename from benchmarks/aes/python/requirements/common.txt rename to benchmarks/aes/python/requirements/common_requirements.txt index 3b0301c8d..ed3e6eaee 100644 --- a/benchmarks/aes/python/requirements/common.txt +++ b/benchmarks/aes/python/requirements/common_requirements.txt @@ -1,5 +1,5 @@ -grpcio==1.45.0 -grpcio-tools==1.45.0 +grpcio==1.63.0 +grpcio-tools==1.63.0 opentelemetry-api==1.3.0 opentelemetry-exporter-zipkin==1.3.0 opentelemetry-exporter-zipkin-json==1.3.0 diff --git a/benchmarks/auth/docker/Dockerfile b/benchmarks/auth/docker/Dockerfile index aadad0626..f79655871 100644 --- a/benchmarks/auth/docker/Dockerfile +++ b/benchmarks/auth/docker/Dockerfile @@ -26,7 +26,7 @@ ## Install gRPC and all other dependencies FROM vhiveease/python-slim:latest as authPythonBuilder WORKDIR /py -COPY ./benchmarks/auth/python/requirements/common.txt ./requirements.txt +COPY ./benchmarks/auth/python/requirements/common_requirements.txt ./requirements.txt RUN pip3 install --user -r requirements.txt COPY ./utils/tracing/python/tracing.py ./ COPY ./benchmarks/auth/python/server.py ./ diff --git a/benchmarks/auth/docker/Dockerfile.Lambda b/benchmarks/auth/docker/Dockerfile.Lambda index b3aa20d88..14fdf383c 100644 --- a/benchmarks/auth/docker/Dockerfile.Lambda +++ b/benchmarks/auth/docker/Dockerfile.Lambda @@ -29,7 +29,7 @@ COPY ./benchmarks/auth/python/server.py ${LAMBDA_TASK_ROOT} # Install the function's dependencies using file requirements.txt # from your project folder. -COPY ./benchmarks/auth/python/requirements/aws_lambda.txt ./requirements.txt +COPY ./benchmarks/auth/python/requirements/aws_lambda_requirements.txt ./requirements.txt RUN pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}" # Set the CMD to handler diff --git a/benchmarks/auth/python/requirements/aws_lambda.txt b/benchmarks/auth/python/requirements/aws_lambda_requirements.txt similarity index 100% rename from benchmarks/auth/python/requirements/aws_lambda.txt rename to benchmarks/auth/python/requirements/aws_lambda_requirements.txt diff --git a/benchmarks/auth/python/requirements/common.txt b/benchmarks/auth/python/requirements/common_requirements.txt similarity index 89% rename from benchmarks/auth/python/requirements/common.txt rename to benchmarks/auth/python/requirements/common_requirements.txt index a3085e5aa..e7f4b67e3 100644 --- a/benchmarks/auth/python/requirements/common.txt +++ b/benchmarks/auth/python/requirements/common_requirements.txt @@ -1,5 +1,5 @@ -grpcio==1.45.0 -grpcio-tools==1.45.0 +grpcio==1.63.0 +grpcio-tools==1.63.0 opentelemetry-api==1.3.0 opentelemetry-exporter-zipkin==1.3.0 opentelemetry-exporter-zipkin-json==1.3.0 diff --git a/benchmarks/fibonacci/python/requirements.txt b/benchmarks/fibonacci/python/requirements.txt index a3085e5aa..f324b4a0a 100644 --- a/benchmarks/fibonacci/python/requirements.txt +++ b/benchmarks/fibonacci/python/requirements.txt @@ -1,5 +1,5 @@ -grpcio==1.45.0 -grpcio-tools==1.45.0 +grpcio==1.63.0 +grpcio-tools==1.64.0 opentelemetry-api==1.3.0 opentelemetry-exporter-zipkin==1.3.0 opentelemetry-exporter-zipkin-json==1.3.0 diff --git a/utils/base-images/Dockerfile b/utils/base-images/Dockerfile index b8a00004f..c33543ac7 100644 --- a/utils/base-images/Dockerfile +++ b/utils/base-images/Dockerfile @@ -30,7 +30,7 @@ LABEL maintainer="https://github.com/vhive-serverless" #---------- python-builder -----------# -FROM python:3.8-slim AS python-slim +FROM python:3.12-slim AS python-slim LABEL maintainer="https://github.com/vhive-serverless"