From 98f9d27e592f6608096dc2a464f22eb9bbd4585e 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 | 10 +++++----- .github/workflows/e2e-auth.yml | 10 +++++----- .github/workflows/e2e-bert.yml | 8 ++++---- .github/workflows/e2e-chained-serving.yml | 6 +++--- .github/workflows/e2e-compression.yml | 4 ++-- .github/workflows/e2e-fibonacci.yml | 8 ++++---- .github/workflows/e2e-gptj.yml | 8 ++++---- .github/workflows/e2e-hotel.yml | 8 ++++---- .github/workflows/e2e-image-rotate.yml | 8 ++++---- .github/workflows/e2e-map-reduce.yml | 6 +++--- .github/workflows/e2e-online-shop.yml | 8 ++++---- .github/workflows/e2e-rnn-serving.yml | 8 ++++---- .github/workflows/e2e-spin-sleep.yml | 8 ++++---- .github/workflows/e2e-stacking-training.yml | 6 +++--- .github/workflows/e2e-tuning-halving.yml | 6 +++--- .github/workflows/e2e-video-analytics-standalone.yml | 8 ++++---- .github/workflows/e2e-video-analytics.yml | 6 +++--- .github/workflows/e2e-video-processing.yml | 8 ++++---- benchmarks/aes/docker/Dockerfile | 2 +- benchmarks/aes/docker/Dockerfile.Lambda | 2 +- .../{aws_lambda.txt => aws_lambda_requirements.txt} | 0 .../{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 .../{common.txt => common_requirements.txt} | 4 ++-- benchmarks/compression/python/requirements.txt | 4 ++-- benchmarks/fibonacci/python/requirements.txt | 4 ++-- benchmarks/image-rotate/python/requirements.txt | 4 ++-- utils/base-images/Dockerfile | 2 +- 30 files changed, 82 insertions(+), 82 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..7744b803b 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 @@ -144,10 +144,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -155,7 +155,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-auth.yml b/.github/workflows/e2e-auth.yml index a7c9175c1..fdd7e8724 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 @@ -144,10 +144,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -155,7 +155,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-bert.yml b/.github/workflows/e2e-bert.yml index 95adfaf4c..9305bc039 100644 --- a/.github/workflows/e2e-bert.yml +++ b/.github/workflows/e2e-bert.yml @@ -118,10 +118,10 @@ jobs: with: lfs: "true" - # - name: start docker-compose benchmark + # - name: start docker compose benchmark # run: | - # docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - # docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + # docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + # docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & # sleep 60s # cat log_file @@ -130,5 +130,5 @@ jobs: # ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello # Currently cannot run on CI due to no enough space on device - # - name: show docker-compose log + # - name: show docker compose log # run: cat log_file diff --git a/.github/workflows/e2e-chained-serving.yml b/.github/workflows/e2e-chained-serving.yml index 3ae1d1004..8b719c8a5 100644 --- a/.github/workflows/e2e-chained-serving.yml +++ b/.github/workflows/e2e-chained-serving.yml @@ -94,20 +94,20 @@ jobs: with: lfs: 'true' - - name: start docker-compose benchmark + - name: start docker compose benchmark env: AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }} AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }} working-directory: benchmarks/chained-function-serving/yamls/docker-compose run: | - docker-compose -f ${{ matrix.file }} up &> log_file & + docker compose -f ${{ matrix.file }} up &> log_file & sleep 60s - name: invoke the chain run: | ./tools/bin/grpcurl -plaintext localhost:${{ matrix.port }} helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat benchmarks/chained-function-serving/yamls/docker-compose/log_file test-knative: diff --git a/.github/workflows/e2e-compression.yml b/.github/workflows/e2e-compression.yml index 4ece5cf41..a4662bd77 100644 --- a/.github/workflows/e2e-compression.yml +++ b/.github/workflows/e2e-compression.yml @@ -95,7 +95,7 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & @@ -112,7 +112,7 @@ jobs: go build ./test-client.go ./test-client --addr localhost:50000 --name "Example text for CI" - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-fibonacci.yml b/.github/workflows/e2e-fibonacci.yml index 4ab7e2569..4656056db 100644 --- a/.github/workflows/e2e-fibonacci.yml +++ b/.github/workflows/e2e-fibonacci.yml @@ -123,10 +123,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -134,7 +134,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-gptj.yml b/.github/workflows/e2e-gptj.yml index 799b46951..b277c2646 100644 --- a/.github/workflows/e2e-gptj.yml +++ b/.github/workflows/e2e-gptj.yml @@ -95,10 +95,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -112,7 +112,7 @@ jobs: go build ./test-client.go ./test-client --addr localhost:50000 --name "Example text for CI" - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-hotel.yml b/.github/workflows/e2e-hotel.yml index daa43bfda..4fd809a59 100644 --- a/.github/workflows/e2e-hotel.yml +++ b/.github/workflows/e2e-hotel.yml @@ -103,10 +103,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -114,7 +114,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-image-rotate.yml b/.github/workflows/e2e-image-rotate.yml index b02829e48..9fe565324 100644 --- a/.github/workflows/e2e-image-rotate.yml +++ b/.github/workflows/e2e-image-rotate.yml @@ -97,10 +97,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -108,7 +108,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-map-reduce.yml b/.github/workflows/e2e-map-reduce.yml index 77fed5b4f..164d977ab 100644 --- a/.github/workflows/e2e-map-reduce.yml +++ b/.github/workflows/e2e-map-reduce.yml @@ -101,10 +101,10 @@ jobs: with: lfs: 'true' - - name: start docker-compose benchmark + - name: start docker compose benchmark working-directory: benchmarks/map-reduce run: | - docker-compose -f docker-compose-s3.yml up &> log_file & + docker compose -f docker-compose-s3.yml up &> log_file & sleep 120s cat log_file @@ -112,7 +112,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50051 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat benchmarks/map-reduce/log_file test-knative: diff --git a/.github/workflows/e2e-online-shop.yml b/.github/workflows/e2e-online-shop.yml index 4ae02120e..5caf3ad95 100644 --- a/.github/workflows/e2e-online-shop.yml +++ b/.github/workflows/e2e-online-shop.yml @@ -111,10 +111,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -122,7 +122,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-rnn-serving.yml b/.github/workflows/e2e-rnn-serving.yml index 0383b6204..de0a36ad6 100644 --- a/.github/workflows/e2e-rnn-serving.yml +++ b/.github/workflows/e2e-rnn-serving.yml @@ -92,10 +92,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -103,7 +103,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-spin-sleep.yml b/.github/workflows/e2e-spin-sleep.yml index 08fef6a6f..5eb917b74 100644 --- a/.github/workflows/e2e-spin-sleep.yml +++ b/.github/workflows/e2e-spin-sleep.yml @@ -96,10 +96,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ matrix.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ matrix.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ matrix.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ matrix.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file - name: invoke the function directly @@ -110,7 +110,7 @@ jobs: run: | go build ./test-client.go ./test-client --addr localhost:50000 --name "Example text for CI" - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-stacking-training.yml b/.github/workflows/e2e-stacking-training.yml index 98e1d8a4d..a8e5f663e 100644 --- a/.github/workflows/e2e-stacking-training.yml +++ b/.github/workflows/e2e-stacking-training.yml @@ -88,17 +88,17 @@ jobs: with: lfs: 'true' - - name: start docker-compose benchmark + - name: start docker compose benchmark working-directory: benchmarks/stacking-training env: BUCKET_NAME: vhive-stacking run: | - docker-compose -f docker-compose-s3.yml up &> log_file & + docker compose -f docker-compose-s3.yml up &> log_file & sleep 60s - name: invoke the chain run: | ./tools/bin/grpcurl -plaintext localhost:50051 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat benchmarks/stacking-training/log_file test-knative: diff --git a/.github/workflows/e2e-tuning-halving.yml b/.github/workflows/e2e-tuning-halving.yml index dcba6208f..4dbeb9c53 100644 --- a/.github/workflows/e2e-tuning-halving.yml +++ b/.github/workflows/e2e-tuning-halving.yml @@ -88,19 +88,19 @@ jobs: with: lfs: 'true' - - name: start docker-compose benchmark + - name: start docker compose benchmark working-directory: benchmarks/tuning-halving env: BUCKET_NAME: vhive-tuning run: | - docker-compose -f docker-compose-s3.yml up &> log_file & + docker compose -f docker-compose-s3.yml up &> log_file & sleep 60s - name: invoke the chain run: | ./tools/bin/grpcurl -plaintext localhost:50051 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat benchmarks/tuning-halving/log_file test-knative: diff --git a/.github/workflows/e2e-video-analytics-standalone.yml b/.github/workflows/e2e-video-analytics-standalone.yml index 9d15145aa..0392bd05f 100644 --- a/.github/workflows/e2e-video-analytics-standalone.yml +++ b/.github/workflows/e2e-video-analytics-standalone.yml @@ -94,10 +94,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -105,7 +105,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: diff --git a/.github/workflows/e2e-video-analytics.yml b/.github/workflows/e2e-video-analytics.yml index bc05d8a55..9edae695b 100644 --- a/.github/workflows/e2e-video-analytics.yml +++ b/.github/workflows/e2e-video-analytics.yml @@ -82,21 +82,21 @@ jobs: with: lfs: 'true' - - name: start docker-compose benchmark + - name: start docker compose benchmark env: AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }} AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }} BUCKET_NAME: "vhive-video-bench" working-directory: benchmarks/video-analytics/yamls/docker-compose run: | - docker-compose -f docker-compose-s3.yml up &> log_file & + docker compose -f docker-compose-s3.yml up &> log_file & sleep 60s - name: invoke the chain run: | ./tools/bin/grpcurl -plaintext localhost:50051 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat benchmarks/video-analytics/yamls/docker-compose/log_file test-knative: diff --git a/.github/workflows/e2e-video-processing.yml b/.github/workflows/e2e-video-processing.yml index e2449a71f..e9541a3c1 100644 --- a/.github/workflows/e2e-video-processing.yml +++ b/.github/workflows/e2e-video-processing.yml @@ -94,10 +94,10 @@ jobs: with: lfs: "true" - - name: start docker-compose benchmark + - name: start docker compose benchmark run: | - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull - docker-compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml pull + docker compose -f ${{ env.YAML_DIR }}/dc-${{ matrix.service }}.yaml up &> log_file & sleep 60s cat log_file @@ -105,7 +105,7 @@ jobs: run: | ./tools/bin/grpcurl -plaintext localhost:50000 helloworld.Greeter.SayHello - - name: show docker-compose log + - name: show docker compose log run: cat log_file test-knative: 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/compression/python/requirements.txt b/benchmarks/compression/python/requirements.txt index dacd6aee9..8ec56995e 100644 --- a/benchmarks/compression/python/requirements.txt +++ b/benchmarks/compression/python/requirements.txt @@ -1,6 +1,6 @@ pymongo -grpcio==1.53.2 -grpcio-tools==1.45.0 +grpcio==1.66.0 +grpcio-tools==1.66.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..4f509e4d7 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.66.0 +grpcio-tools==1.66.0 opentelemetry-api==1.3.0 opentelemetry-exporter-zipkin==1.3.0 opentelemetry-exporter-zipkin-json==1.3.0 diff --git a/benchmarks/image-rotate/python/requirements.txt b/benchmarks/image-rotate/python/requirements.txt index b86b2eeae..c24b35b29 100644 --- a/benchmarks/image-rotate/python/requirements.txt +++ b/benchmarks/image-rotate/python/requirements.txt @@ -1,7 +1,7 @@ pillow pymongo -grpcio==1.45.0 -grpcio-tools==1.45.0 +grpcio==1.66.0 +grpcio-tools==1.66.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"