diff --git a/templates/tools/dockerfile/python_deps.include b/templates/tools/dockerfile/python_deps.include index cdacfddfed9..537a6a18e22 100644 --- a/templates/tools/dockerfile/python_deps.include +++ b/templates/tools/dockerfile/python_deps.include @@ -12,4 +12,4 @@ RUN apt-get update && apt-get install -y ${'\\'} RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 diff --git a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template index e1b1d20e5a0..bd05005fb42 100644 --- a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template @@ -42,7 +42,7 @@ # Install Python packages from PyPI RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv - RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.10.0 twisted==17.5.0 + RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client diff --git a/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile index 39d26d4b01a..6c65771582d 100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 #================ # C# dependencies diff --git a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile index 39d26d4b01a..6c65771582d 100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 #================ # C# dependencies diff --git a/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile index 40b56cc8198..6a2863af50b 100644 --- a/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 #================= # C++ dependencies diff --git a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile index 78f6a72249b..62c68b16e11 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile index 06787bc7e4b..146af2d6c36 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile index 2467c1eeb02..ad79c75a605 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile index e8384dd4ff8..45fd264d3b4 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile index d0232d6b340..ef13d2d7e93 100644 --- a/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 RUN pip install twisted h2==2.6.1 hyper diff --git a/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile index cc9e2545353..5754ead72e6 100644 --- a/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 #================== # Node dependencies diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile index b3becf17075..9507dbce50f 100644 --- a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 #================== # Ruby dependencies diff --git a/tools/dockerfile/interoptest/lb_interop_fake_servers/Dockerfile b/tools/dockerfile/interoptest/lb_interop_fake_servers/Dockerfile index f07a3b5b1d5..f317b5bc468 100644 --- a/tools/dockerfile/interoptest/lb_interop_fake_servers/Dockerfile +++ b/tools/dockerfile/interoptest/lb_interop_fake_servers/Dockerfile @@ -28,7 +28,7 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin # Install Python packages from PyPI RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/test/bazel/Dockerfile b/tools/dockerfile/test/bazel/Dockerfile index 4080538ca5d..c10b83ec24d 100644 --- a/tools/dockerfile/test/bazel/Dockerfile +++ b/tools/dockerfile/test/bazel/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 #================= diff --git a/tools/dockerfile/test/csharp_stretch_x64/Dockerfile b/tools/dockerfile/test/csharp_stretch_x64/Dockerfile index 684c26f45be..609b34f9456 100644 --- a/tools/dockerfile/test/csharp_stretch_x64/Dockerfile +++ b/tools/dockerfile/test/csharp_stretch_x64/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile index c75945fe8a2..fbab3d3e09f 100644 --- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile @@ -40,7 +40,7 @@ RUN apk update && apk add \ # Install Python packages from PyPI RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client diff --git a/tools/dockerfile/test/cxx_buster_x64/Dockerfile b/tools/dockerfile/test/cxx_buster_x64/Dockerfile index 1f436145906..7ab73923df4 100644 --- a/tools/dockerfile/test/cxx_buster_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_buster_x64/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index 00f51cfe4f9..a9a61240e4a 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index ce5e074d9a7..3d5cf6dcd85 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile index 3c744832024..043b1a6773b 100644 --- a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile index 637ad1f6bbf..7928ef06c88 100644 --- a/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/fuzzer/Dockerfile b/tools/dockerfile/test/fuzzer/Dockerfile index 9f9f247c53c..3e776f0e083 100644 --- a/tools/dockerfile/test/fuzzer/Dockerfile +++ b/tools/dockerfile/test/fuzzer/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index 30c278c9267..5936a81bce1 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/php73_zts_stretch_x64/Dockerfile b/tools/dockerfile/test/php73_zts_stretch_x64/Dockerfile index 0113d6833d8..446e2872a33 100644 --- a/tools/dockerfile/test/php73_zts_stretch_x64/Dockerfile +++ b/tools/dockerfile/test/php73_zts_stretch_x64/Dockerfile @@ -34,7 +34,7 @@ RUN cd pthreads && \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 RUN curl -sS https://getcomposer.org/installer | php RUN mv composer.phar /usr/local/bin/composer diff --git a/tools/dockerfile/test/php7_jessie_x64/Dockerfile b/tools/dockerfile/test/php7_jessie_x64/Dockerfile index 60fec1d47d6..2e456a11527 100644 --- a/tools/dockerfile/test/php7_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php7_jessie_x64/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/python_alpine_x64/Dockerfile b/tools/dockerfile/test/python_alpine_x64/Dockerfile index 1b806ab7f4d..b36b1343f14 100644 --- a/tools/dockerfile/test/python_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/python_alpine_x64/Dockerfile @@ -39,7 +39,7 @@ RUN apk update && apk add \ # Install Python packages from PyPI RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.10.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.15.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile index 12dc3850e57..b0f6ddb8e5f 100644 --- a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \ RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0 # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client oauth2client diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 635f19596f2..a52c2e6dbb9 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -26,7 +26,7 @@ ulimit -a # - only add stuff that you absolutely need for your builds to work (add comment to explain why its needed) # Add GCP credentials for BQ access -pip install --user google-api-python-client oauth2client +pip install --user google-api-python-client oauth2client six==1.15.0 export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json # If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests @@ -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==44.1.1 twisted pyyaml pyjwt cryptography requests + time pip install --user --upgrade Mako tox setuptools==44.1.1 twisted pyyaml pyjwt cryptography requests # make sure md5sum is available (requires coreutils 8.31+) brew update-reset