Fix pypa link (#25647)

* Fix pypa link

* And 3.5 as well
pull/25321/head^2
Richard Belleville 4 years ago committed by GitHub
parent d9903aa44e
commit 1437dc9816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      templates/tools/dockerfile/apt_get_python_27.include
  2. 2
      templates/tools/dockerfile/python_debian11.include
  3. 2
      templates/tools/dockerfile/python_deps.include
  4. 2
      templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template
  5. 2
      templates/tools/dockerfile/test/python_stretch_default_x64/Dockerfile.template
  6. 2
      tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile
  7. 2
      tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile
  8. 2
      tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile
  9. 2
      tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
  10. 2
      tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile
  11. 2
      tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile
  12. 2
      tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile
  13. 2
      tools/dockerfile/interoptest/grpc_interop_node/Dockerfile
  14. 2
      tools/dockerfile/interoptest/grpc_interop_python/Dockerfile
  15. 2
      tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile
  16. 2
      tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
  17. 2
      tools/dockerfile/test/bazel/Dockerfile
  18. 2
      tools/dockerfile/test/csharp_stretch_x64/Dockerfile
  19. 2
      tools/dockerfile/test/cxx_buster_x64/Dockerfile
  20. 2
      tools/dockerfile/test/cxx_jessie_x64/Dockerfile
  21. 2
      tools/dockerfile/test/cxx_jessie_x86/Dockerfile
  22. 2
      tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile
  23. 2
      tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile
  24. 2
      tools/dockerfile/test/node_jessie_x64/Dockerfile
  25. 2
      tools/dockerfile/test/php7_jessie_x64/Dockerfile
  26. 2
      tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile
  27. 4
      tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile
  28. 2
      tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
  29. 2
      tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile
  30. 2
      tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile
  31. 4
      tools/dockerfile/test/python_stretch_default_x64/Dockerfile
  32. 2
      tools/dockerfile/test/ruby_buster_x64/Dockerfile
  33. 2
      tools/dockerfile/test/sanity/Dockerfile
  34. 2
      tools/run_tests/helper_scripts/build_python.sh

@ -1,3 +1,3 @@
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7

@ -47,7 +47,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py | python3
# Install Python 2.7
RUN apt-get update && apt-get install -y python2 python2-dev
RUN ln -s /usr/bin/python2 /usr/bin/python
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2
<%include file="./gcp_api_libraries.include"/>
<%include file="./run_tests_addons.include"/>

@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y ${'\\'}
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -17,4 +17,4 @@
<%include file="../../python_stretch.include"/>
RUN apt-get update && apt-get install -y python3.5 python3-all-dev
RUN curl https://bootstrap.pypa.io/3.5/get-pip.py | python3.5
RUN curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3.5

@ -19,7 +19,7 @@
<%include file="../../compile_python_38.include"/>
RUN apt-get update && apt-get install -y python3.5 python3.5-dev
RUN curl https://bootstrap.pypa.io/3.5/get-pip.py | python3.5
RUN curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3.5
RUN apt-get update && apt-get -t buster install -y python3.7 python3-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -72,7 +72,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -72,7 +72,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
@ -65,4 +65,4 @@ RUN mkdir /var/local/jenkins
RUN apt-get update && apt-get install -y python3.5 python3-all-dev
RUN curl https://bootstrap.pypa.io/3.5/get-pip.py | python3.5
RUN curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3.5

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# Install Python 2.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
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
@ -105,7 +105,7 @@ RUN python3.8 -m ensurepip && \
RUN apt-get update && apt-get install -y python3.5 python3.5-dev
RUN curl https://bootstrap.pypa.io/3.5/get-pip.py | python3.5
RUN curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3.5
RUN apt-get update && apt-get -t buster install -y python3.7 python3-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7

@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
python-setuptools
# Install Python packages from PyPI
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
RUN curl https://bootstrap.pypa.io/pip/2.7/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.15.0 twisted==17.5.0

@ -61,7 +61,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py | python3
# Install Python 2.7
RUN apt-get update && apt-get install -y python2 python2-dev
RUN ln -s /usr/bin/python2 /usr/bin/python
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2
# Google Cloud platform API libraries
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

@ -153,7 +153,7 @@ fi
# See https://github.com/grpc/grpc/issues/14815 for more context. We cannot rely
# on pip to upgrade itself because if pip is too old, it may not have the required
# TLS version to run `pip install`.
curl https://bootstrap.pypa.io/2.7/get-pip.py | $VENV_PYTHON
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | $VENV_PYTHON
# pip-installs the directory specified. Used because on MSYS the vanilla Windows
# Python gets confused when parsing paths.

Loading…
Cancel
Save