diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile deleted file mode 100644 index 51a6758385f..00000000000 --- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2019 The gRPC Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Docker file for building gRPC manylinux Python artifacts. - -FROM quay.io/pypa/manylinux2010_x86_64:2022-01-22-72ab18b - -# manylinux_2_12 is the preferred alias of manylinux2010 -ENV AUDITWHEEL_PLAT manylinux_2_12_$AUDITWHEEL_ARCH - -# TODO(jtattermusch): revisit which of the deps are really required -RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc - -################################### -# Install Python build requirements -RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython -RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython -RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython -RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython -RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython - -#================= -# Install ccache - -# Install ccache from source since ccache 3.x packaged with most linux distributions -# does not support Redis backend for caching. -RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ - && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ - && mkdir build && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ - && make -j4 && make install \ - && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile deleted file mode 100644 index a7e1815e2bd..00000000000 --- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2019 The gRPC Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Docker file for building gRPC manylinux Python artifacts. - -FROM quay.io/pypa/manylinux2010_i686:2022-01-22-72ab18b - -# manylinux_2_12 is the preferred alias of manylinux2010 -ENV AUDITWHEEL_PLAT manylinux_2_12_$AUDITWHEEL_ARCH - -# TODO(jtattermusch): revisit which of the deps are really required -RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc - -################################### -# Install Python build requirements -RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython -RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython -RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython -RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython -RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython - -#================= -# Install ccache - -# Install ccache from source since ccache 3.x packaged with most linux distributions -# does not support Redis backend for caching. -RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ - && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ - && mkdir build && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ - && make -j4 && make install \ - && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index 2f91787d97f..355a296fed4 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -433,23 +433,15 @@ def targets(): CSharpExtArtifact('linux', 'android', arch_abi='x86', presubmit=True), CSharpExtArtifact('macos', 'ios', presubmit=True), PythonArtifact('manylinux2014', 'x64', 'cp36-cp36m', presubmit=True), - PythonArtifact('manylinux2014', 'x64', 'cp37-cp37m'), + PythonArtifact('manylinux2014', 'x64', 'cp37-cp37m', presubmit=True), PythonArtifact('manylinux2014', 'x64', 'cp38-cp38'), PythonArtifact('manylinux2014', 'x64', 'cp39-cp39'), PythonArtifact('manylinux2014', 'x64', 'cp310-cp310', presubmit=True), PythonArtifact('manylinux2014', 'x86', 'cp36-cp36m', presubmit=True), - PythonArtifact('manylinux2014', 'x86', 'cp37-cp37m'), + PythonArtifact('manylinux2014', 'x86', 'cp37-cp37m', presubmit=True), PythonArtifact('manylinux2014', 'x86', 'cp38-cp38'), PythonArtifact('manylinux2014', 'x86', 'cp39-cp39'), PythonArtifact('manylinux2014', 'x86', 'cp310-cp310', presubmit=True), - PythonArtifact('manylinux2010', 'x64', 'cp36-cp36m'), - PythonArtifact('manylinux2010', 'x64', 'cp37-cp37m', presubmit=True), - PythonArtifact('manylinux2010', 'x64', 'cp38-cp38'), - PythonArtifact('manylinux2010', 'x64', 'cp39-cp39'), - PythonArtifact('manylinux2010', 'x86', 'cp36-cp36m'), - PythonArtifact('manylinux2010', 'x86', 'cp37-cp37m', presubmit=True), - PythonArtifact('manylinux2010', 'x86', 'cp38-cp38'), - PythonArtifact('manylinux2010', 'x86', 'cp39-cp39'), PythonArtifact('manylinux2014', 'aarch64', 'cp36-cp36m', presubmit=True), PythonArtifact('manylinux2014', 'aarch64', 'cp37-cp37m'),