diff --git a/templates/tools/dockerfile/gcp_api_libraries.include b/templates/tools/dockerfile/gcp_api_libraries.include index f93c24176f7..dadb3d8d943 100644 --- a/templates/tools/dockerfile/gcp_api_libraries.include +++ b/templates/tools/dockerfile/gcp_api_libraries.include @@ -1,2 +1,2 @@ # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index bba87819538..cd4aab5317d 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -33,6 +33,9 @@ RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml six + # Upgrade Python's YAML library + RUN python3 -m pip install --upgrade --ignore-installed PyYAML==5.4.1 --user + # Add buster-backports for more recent clang packages RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh index 9b5c0f50bb2..81c16153c71 100755 --- a/tools/buildgen/generate_projects.sh +++ b/tools/buildgen/generate_projects.sh @@ -18,9 +18,6 @@ set -e export TEST=${TEST:-false} -# Upgrade Python's YAML library -python3 -m pip install --upgrade --ignore-installed PyYAML --user - echo "Generating build_autogenerated.yaml from bazel BUILD file" rm -f build_autogenerated.yaml python3 tools/buildgen/extract_metadata_from_bazel_xml.py diff --git a/tools/dockerfile/grpc_clang_tidy/Dockerfile b/tools/dockerfile/grpc_clang_tidy/Dockerfile index 37c96f1041d..7ef5783710f 100644 --- a/tools/dockerfile/grpc_clang_tidy/Dockerfile +++ b/tools/dockerfile/grpc_clang_tidy/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 RUN mkdir /var/local/jenkins diff --git a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile index fc881939af5..5554b7a9850 100644 --- a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile index fc881939af5..5554b7a9850 100644 --- a/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/test/csharp_stretch_x64/Dockerfile b/tools/dockerfile/test/csharp_stretch_x64/Dockerfile index 6631979386b..27673ee947a 100644 --- a/tools/dockerfile/test/csharp_stretch_x64/Dockerfile +++ b/tools/dockerfile/test/csharp_stretch_x64/Dockerfile @@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================ # C# dependencies diff --git a/tools/dockerfile/test/cxx_buster_x64/Dockerfile b/tools/dockerfile/test/cxx_buster_x64/Dockerfile index 781c9419496..db4920260bc 100644 --- a/tools/dockerfile/test/cxx_buster_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_buster_x64/Dockerfile @@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================= # C++ dependencies diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index 1317f8e1c1d..54646e32a50 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -67,7 +67,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================= # C++ dependencies diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index 372b3ddc905..d0625c26f65 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -67,7 +67,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================= # C++ dependencies diff --git a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile index 42d5e9e9659..e1a2d7d1847 100644 --- a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile @@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================= # C++ dependencies diff --git a/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile index ba67279347a..ce6da699593 100644 --- a/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile @@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================= # C++ dependencies diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index 80dec84ae54..0bb4423ed8b 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -78,7 +78,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================== # Node dependencies diff --git a/tools/dockerfile/test/php7_jessie_x64/Dockerfile b/tools/dockerfile/test/php7_jessie_x64/Dockerfile index 6efbdc09516..1946d8f4966 100644 --- a/tools/dockerfile/test/php7_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php7_jessie_x64/Dockerfile @@ -78,7 +78,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================= # PHP Test dependencies diff --git a/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile index 617e6fe2f10..fe85dad9516 100644 --- a/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile index 1b9e5e0d027..89861386699 100644 --- a/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile index 8e1393ed3a9..ffe9f32856f 100644 --- a/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile index bcac4b50deb..00a976ac877 100644 --- a/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile index d6c0a99eeb0..572769f0d9f 100644 --- a/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/test/python_stretch_default_x64/Dockerfile b/tools/dockerfile/test/python_stretch_default_x64/Dockerfile index 331c28e6448..a16238d38d4 100644 --- a/tools/dockerfile/test/python_stretch_default_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_default_x64/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list diff --git a/tools/dockerfile/test/ruby_buster_x64/Dockerfile b/tools/dockerfile/test/ruby_buster_x64/Dockerfile index 7ac16731c69..fdd9a0b8f8f 100644 --- a/tools/dockerfile/test/ruby_buster_x64/Dockerfile +++ b/tools/dockerfile/test/ruby_buster_x64/Dockerfile @@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 #================== # Ruby dependencies diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index aaafec98e8b..1313f383e5f 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7 # Google Cloud platform API libraries -RUN pip install --upgrade google-api-python-client oauth2client +RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0 RUN mkdir /var/local/jenkins @@ -81,6 +81,9 @@ RUN apt-get update && apt-get install -y \ RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml six +# Upgrade Python's YAML library +RUN python3 -m pip install --upgrade --ignore-installed PyYAML==5.4.1 --user + # Add buster-backports for more recent clang packages RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list