From 08672de3ecdc513967f4476e59c3feb8f882cf9d Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 30 Jan 2025 21:43:20 -0800 Subject: [PATCH] x --- tools/internal_ci/helper_scripts/prepare_build_linux_rc | 2 +- tools/internal_ci/helper_scripts/prepare_build_macos_rc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/internal_ci/helper_scripts/prepare_build_linux_rc b/tools/internal_ci/helper_scripts/prepare_build_linux_rc index 79baf05f29940..9ed9280585200 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_linux_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_linux_rc @@ -38,7 +38,7 @@ fi git submodule update --init -python3 -m pip install six +python3 -m pip install six Mako # Allows the test driver to spin up a GDB subprocess and have it attach to # another subprocess of the test driver. diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 1cfd4cba7cec4..0f206e3adec11 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -57,6 +57,10 @@ if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ]; then export RUN_TESTS_FLAGS="--filter_pr_tests --base_branch origin/$KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH $RUN_TESTS_FLAGS" fi +# python +time pip install --user -r $DIR/requirements.macos.txt +time pip install --user --upgrade virtualenv Mako tox setuptools==44.1.1 twisted + if [ "${PREPARE_BUILD_INSTALL_DEPS_RUBY}" == "true" ] then # Workaround for https://github.com/rvm/rvm/issues/5133 @@ -121,10 +125,6 @@ fi if [ "${PREPARE_BUILD_INSTALL_DEPS_PYTHON}" == "true" ] then - # python - time pip install --user -r $DIR/requirements.macos.txt - time pip install --user --upgrade virtualenv Mako tox setuptools==44.1.1 twisted - # Force reinstall of python3.7 to upgrade its patch version. # Kokoro mac workers come with python 3.7.3 and that version # suffers from https://bugs.python.org/issue22490.