From 6dc928c98cf629034d60c3e6db5c2fb8b66db48a Mon Sep 17 00:00:00 2001 From: Richard Belleville <rbellevi@google.com> Date: Mon, 22 Jan 2024 16:16:22 -0800 Subject: [PATCH] [buildgen] Ensure virtualenv is installed (#35624) [Manual run](https://fusion2.corp.google.com/ci/kokoro/prod:grpc%2Fcore%2Fmaster%2Flinux%2Fgrpc_build_boringssl_at_head/activity/d33676a9-7bf8-452f-a720-77cca2950c22/log) Closes #35624 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35624 from gnossen:fix_fix_protobuf e8613764d2ac3cbf5b1350d866c39368a870151e PiperOrigin-RevId: 600601009 --- requirements.bazel.txt | 4 ++-- tools/buildgen/generate_projects.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.bazel.txt b/requirements.bazel.txt index fdf2e6188dc..2ef85776d14 100644 --- a/requirements.bazel.txt +++ b/requirements.bazel.txt @@ -23,9 +23,9 @@ proto-plus==1.22.3 google-auth==2.23.4 googleapis-common-protos==1.61.0 cachetools==5.3.2 -charset-normalizer==3.3.2 +charset-normalizer==3.3.2 pyasn1==0.5.0 -rsa==4.9 +rsa==4.9 greenlet==1.1.3.post0 zope.interface==6.1 opentelemetry-sdk==1.21.0 diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh index 165ebc10b36..31e81bcc027 100755 --- a/tools/buildgen/generate_projects.sh +++ b/tools/buildgen/generate_projects.sh @@ -36,7 +36,7 @@ tools/buildgen/build_cleaner.py build_handwritten.yaml # /usr/local/google/home/rbellevi/dev/tmp/grpc/venv/bin/python3: No module named virtualenv # Generate xds-protos -[[ -d generate_projects_virtual_environment ]] || python3 -m virtualenv generate_projects_virtual_environment +[[ -d generate_projects_virtual_environment ]] || { python3 -m pip install virtualenv --upgrade && python3 -m virtualenv generate_projects_virtual_environment; } generate_projects_virtual_environment/bin/pip install --upgrade --ignore-installed grpcio-tools==1.59.0 generate_projects_virtual_environment/bin/python tools/distrib/python/xds_protos/build.py