Merge pull request #15765 from mehrdada/backport-15632-into-v1.13.x

Backport 15632 into v1.13.x

tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile

@@ -14,7 +14,9 @@
 
 # Docker file for building gRPC manylinux Python artifacts.
 
-FROM quay.io/pypa/manylinux1_x86_64
+# TODO(mmx): revert to the official manylinux1 docker image
+# after it ships with Python 3.7
+FROM grpctesting/manylinux1_temp_py37rc1_x86_64:79891dc2ec764b62a2dd2ffd083d381efde11a5f
 
 # Update the package manager
 RUN yum update -y
@@ -27,6 +29,7 @@ RUN /opt/python/cp27-cp27mu/bin/pip install cython
 RUN /opt/python/cp34-cp34m/bin/pip install cython
 RUN /opt/python/cp35-cp35m/bin/pip install cython
 RUN /opt/python/cp36-cp36m/bin/pip install cython
+RUN /opt/python/cp37-cp37m/bin/pip install cython
 
 ####################################################
 # Install auditwheel with fix for namespace packages

tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile

@@ -14,7 +14,9 @@
 
 # Docker file for building gRPC manylinux Python artifacts.
 
-FROM quay.io/pypa/manylinux1_i686
+# TODO(mmx): revert to the official manylinux1 docker image
+# after it ships with Python 3.7
+FROM grpctesting/manylinux1_temp_py37rc1_i686:79891dc2ec764b62a2dd2ffd083d381efde11a5f
 
 # Update the package manager
 RUN yum update -y
@@ -27,6 +29,7 @@ RUN /opt/python/cp27-cp27mu/bin/pip install cython
 RUN /opt/python/cp34-cp34m/bin/pip install cython
 RUN /opt/python/cp35-cp35m/bin/pip install cython
 RUN /opt/python/cp36-cp36m/bin/pip install cython
+RUN /opt/python/cp37-cp37m/bin/pip install cython
 
 ####################################################
 # Install auditwheel with fix for namespace packages

tools/run_tests/artifacts/artifact_targets.py

@@ -354,6 +354,7 @@ def targets():
         PythonArtifact('linux', 'x86', 'cp34-cp34m'),
         PythonArtifact('linux', 'x86', 'cp35-cp35m'),
         PythonArtifact('linux', 'x86', 'cp36-cp36m'),
+        PythonArtifact('linux', 'x86', 'cp37-cp37m'),
         PythonArtifact('linux_extra', 'armv7', '2.7'),
         PythonArtifact('linux_extra', 'armv7', '3.4'),
         PythonArtifact('linux_extra', 'armv7', '3.5'),
@@ -367,6 +368,7 @@ def targets():
         PythonArtifact('linux', 'x64', 'cp34-cp34m'),
         PythonArtifact('linux', 'x64', 'cp35-cp35m'),
         PythonArtifact('linux', 'x64', 'cp36-cp36m'),
+        PythonArtifact('linux', 'x64', 'cp37-cp37m'),
         PythonArtifact('macos', 'x64', 'python2.7'),
         PythonArtifact('macos', 'x64', 'python3.4'),
         PythonArtifact('macos', 'x64', 'python3.5'),