Skip to content

Commit

Permalink
Upgrade Python to 3.12
Browse files Browse the repository at this point in the history
Signed-off-by: David Schall <[email protected]>
  • Loading branch information
dhschall authored Aug 26, 2024
1 parent 135a667 commit 574937b
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-aes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/aes/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# Install gRPC and all other dependencies
FROM vhiveease/python-slim:latest as aesPythonBuilder

Check warning on line 26 in benchmarks/aes/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (aes-nodejs, aesNodeJS)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 26 in benchmarks/aes/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (aes-nodejs, aesNodeJS)

Stage names should be lowercase

StageNameCasing: Stage name 'aesPythonBuilder' should be lowercase More info: https://docs.docker.com/go/dockerfile/rule/stage-name-casing/

Check warning on line 26 in benchmarks/aes/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (aes-go, aesGo)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 26 in benchmarks/aes/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (aes-go, aesGo)

Stage names should be lowercase

StageNameCasing: Stage name 'aesPythonBuilder' should be lowercase More info: https://docs.docker.com/go/dockerfile/rule/stage-name-casing/
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 ./
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/aes/docker/Dockerfile.Lambda
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/auth/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
## Install gRPC and all other dependencies
FROM vhiveease/python-slim:latest as authPythonBuilder

Check warning on line 27 in benchmarks/auth/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (auth-python, authPython)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 27 in benchmarks/auth/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (auth-python, authPython)

Stage names should be lowercase

StageNameCasing: Stage name 'authPythonBuilder' should be lowercase More info: https://docs.docker.com/go/dockerfile/rule/stage-name-casing/

Check warning on line 27 in benchmarks/auth/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (auth-go, authGo)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 27 in benchmarks/auth/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (auth-go, authGo)

Stage names should be lowercase

StageNameCasing: Stage name 'authPythonBuilder' should be lowercase More info: https://docs.docker.com/go/dockerfile/rule/stage-name-casing/

Check warning on line 27 in benchmarks/auth/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (auth-nodejs, authNodeJS)

Stage names should be lowercase

StageNameCasing: Stage name 'authPythonBuilder' should be lowercase More info: https://docs.docker.com/go/dockerfile/rule/stage-name-casing/

Check warning on line 27 in benchmarks/auth/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push all images (auth-nodejs, authNodeJS)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
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 ./
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/auth/docker/Dockerfile.Lambda
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/fibonacci/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/base-images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down

0 comments on commit 574937b

Please sign in to comment.