From 6a5d7106a0d51a87d3250c92e75e71725693fbaf Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 31 Aug 2020 11:20:44 -0700 Subject: [PATCH 1/3] Pin setuptools to 49.6.0 --- .../internal_ci/helper_scripts/prepare_build_macos_rc | 2 +- tools/internal_ci/macos/grpc_build_artifacts.sh | 10 +++++----- tools/run_tests/artifacts/build_artifact_python.bat | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index e68a89acc04..875672da4c0 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -88,7 +88,7 @@ if [ "${PREPARE_BUILD_INSTALL_DEPS_PYTHON}" == "true" ] then # python time pip install --user virtualenv - time pip install --user --upgrade Mako six tox setuptools twisted pyyaml pyjwt cryptography requests + time pip install --user --upgrade Mako six tox setuptools==49.6.0 twisted pyyaml pyjwt cryptography requests export PYTHONPATH=/Library/Python/3.4/site-packages # make sure md5sum is available (requires coreutils 8.31+) diff --git a/tools/internal_ci/macos/grpc_build_artifacts.sh b/tools/internal_ci/macos/grpc_build_artifacts.sh index 10fe02a1215..966737a4d4a 100755 --- a/tools/internal_ci/macos/grpc_build_artifacts.sh +++ b/tools/internal_ci/macos/grpc_build_artifacts.sh @@ -24,11 +24,11 @@ export PREPARE_BUILD_INSTALL_DEPS_RUBY=true source tools/internal_ci/helper_scripts/prepare_build_macos_rc # install cython for all python versions -python2.7 -m pip install -U cython setuptools wheel --user -python3.5 -m pip install -U cython setuptools wheel --user -python3.6 -m pip install -U cython setuptools wheel --user -python3.7 -m pip install -U cython setuptools wheel --user -python3.8 -m pip install -U cython setuptools wheel --user +python2.7 -m pip install -U cython setuptools==49.6.0 wheel --user +python3.5 -m pip install -U cython setuptools==49.6.0 wheel --user +python3.6 -m pip install -U cython setuptools==49.6.0 wheel --user +python3.7 -m pip install -U cython setuptools==49.6.0 wheel --user +python3.8 -m pip install -U cython setuptools==49.6.0 wheel --user # needed to build ruby artifacts time bash tools/distrib/build_ruby_environment_macos.sh diff --git a/tools/run_tests/artifacts/build_artifact_python.bat b/tools/run_tests/artifacts/build_artifact_python.bat index 82d7a48fde6..939853cfe58 100644 --- a/tools/run_tests/artifacts/build_artifact_python.bat +++ b/tools/run_tests/artifacts/build_artifact_python.bat @@ -17,7 +17,7 @@ set PATH=C:\%1;C:\%1\scripts;C:\msys64\mingw%2\bin;C:\tools\msys64\mingw%2\bin;% python -m pip install --upgrade six @rem some artifacts are broken for setuptools 38.5.0. See https://github.com/grpc/grpc/issues/14317 -python -m pip install --upgrade setuptools==38.2.4 +python -m pip install --upgrade setuptools==49.6.0 python -m pip install --upgrade cython python -m pip install -rrequirements.txt --user From 82f0f516904db3fe242284e9c722554359ad3a3b Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 31 Aug 2020 11:33:03 -0700 Subject: [PATCH 2/3] Pin to 44.1.1 for Python 2 compatibility --- .../internal_ci/helper_scripts/prepare_build_macos_rc | 2 +- tools/internal_ci/macos/grpc_build_artifacts.sh | 10 +++++----- tools/run_tests/artifacts/build_artifact_python.bat | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 875672da4c0..e7bc43946c9 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -88,7 +88,7 @@ if [ "${PREPARE_BUILD_INSTALL_DEPS_PYTHON}" == "true" ] then # python time pip install --user virtualenv - time pip install --user --upgrade Mako six tox setuptools==49.6.0 twisted pyyaml pyjwt cryptography requests + time pip install --user --upgrade Mako six tox setuptools==44.1.1 twisted pyyaml pyjwt cryptography requests export PYTHONPATH=/Library/Python/3.4/site-packages # make sure md5sum is available (requires coreutils 8.31+) diff --git a/tools/internal_ci/macos/grpc_build_artifacts.sh b/tools/internal_ci/macos/grpc_build_artifacts.sh index 966737a4d4a..878d30dc12b 100755 --- a/tools/internal_ci/macos/grpc_build_artifacts.sh +++ b/tools/internal_ci/macos/grpc_build_artifacts.sh @@ -24,11 +24,11 @@ export PREPARE_BUILD_INSTALL_DEPS_RUBY=true source tools/internal_ci/helper_scripts/prepare_build_macos_rc # install cython for all python versions -python2.7 -m pip install -U cython setuptools==49.6.0 wheel --user -python3.5 -m pip install -U cython setuptools==49.6.0 wheel --user -python3.6 -m pip install -U cython setuptools==49.6.0 wheel --user -python3.7 -m pip install -U cython setuptools==49.6.0 wheel --user -python3.8 -m pip install -U cython setuptools==49.6.0 wheel --user +python2.7 -m pip install -U cython setuptools==44.1.1 wheel --user +python3.5 -m pip install -U cython setuptools==44.1.1 wheel --user +python3.6 -m pip install -U cython setuptools==44.1.1 wheel --user +python3.7 -m pip install -U cython setuptools==44.1.1 wheel --user +python3.8 -m pip install -U cython setuptools==44.1.1 wheel --user # needed to build ruby artifacts time bash tools/distrib/build_ruby_environment_macos.sh diff --git a/tools/run_tests/artifacts/build_artifact_python.bat b/tools/run_tests/artifacts/build_artifact_python.bat index 939853cfe58..ff5a6af6fcd 100644 --- a/tools/run_tests/artifacts/build_artifact_python.bat +++ b/tools/run_tests/artifacts/build_artifact_python.bat @@ -17,7 +17,7 @@ set PATH=C:\%1;C:\%1\scripts;C:\msys64\mingw%2\bin;C:\tools\msys64\mingw%2\bin;% python -m pip install --upgrade six @rem some artifacts are broken for setuptools 38.5.0. See https://github.com/grpc/grpc/issues/14317 -python -m pip install --upgrade setuptools==49.6.0 +python -m pip install --upgrade setuptools==44.1.1 python -m pip install --upgrade cython python -m pip install -rrequirements.txt --user From c8fa1c9978c0b4f90fb4a81b0be15a7eafffb8c6 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 31 Aug 2020 12:26:24 -0700 Subject: [PATCH 3/3] Pin setuptools in one more location --- tools/run_tests/helper_scripts/build_python.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh index 60031fa6e95..a9a186c52bd 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -184,8 +184,9 @@ case "$VENV" in ;; esac + +pip_install --upgrade setuptools==44.1.1 pip_install --upgrade pip==19.3.1 -pip_install --upgrade setuptools pip_install --upgrade cython pip_install --upgrade six enum34 protobuf