From 60b68b884d1475e7a671791a395fdaac64646e21 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 17 Sep 2019 13:04:43 -0700 Subject: [PATCH] Remove manylinux2010 i686 targets --- .../Dockerfile | 38 ------------------- tools/run_tests/artifacts/artifact_targets.py | 8 +--- 2 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile 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 a4acb30d09d..00000000000 --- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile +++ /dev/null @@ -1,38 +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 - -# Update the package manager -RUN yum update -y -RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc - -################################### -# Install Python build requirements -RUN /opt/python/cp27-cp27m/bin/pip install cython -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 -RUN git clone https://github.com/pypa/auditwheel /usr/local/src/auditwheel -RUN cd /usr/local/src/auditwheel && git checkout 2.1 -RUN /opt/python/cp36-cp36m/bin/pip install /usr/local/src/auditwheel -RUN rm /usr/local/bin/auditwheel -RUN cd /usr/local/bin && ln -s /opt/python/cp36-cp36m/bin/auditwheel diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index e251e29dbf7..7f35eb19cf3 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -361,18 +361,14 @@ def targets(): CSharpExtArtifact('linux', 'android', arch_abi='armeabi-v7a'), CSharpExtArtifact('linux', 'android', arch_abi='x86'), CSharpExtArtifact('macos', 'ios'), + # TODO(https://github.com/grpc/grpc/issues/20283) + # Add manylinux2010_x86 targets once this issue is resolved. PythonArtifact('manylinux1', 'x86', 'cp27-cp27m'), PythonArtifact('manylinux1', 'x86', 'cp27-cp27mu'), PythonArtifact('manylinux1', 'x86', 'cp34-cp34m'), PythonArtifact('manylinux1', 'x86', 'cp35-cp35m'), PythonArtifact('manylinux1', 'x86', 'cp36-cp36m'), PythonArtifact('manylinux1', 'x86', 'cp37-cp37m'), - PythonArtifact('manylinux2010', 'x86', 'cp27-cp27m'), - PythonArtifact('manylinux2010', 'x86', 'cp27-cp27mu'), - PythonArtifact('manylinux2010', 'x86', 'cp34-cp34m'), - PythonArtifact('manylinux2010', 'x86', 'cp35-cp35m'), - PythonArtifact('manylinux2010', 'x86', 'cp36-cp36m'), - PythonArtifact('manylinux2010', 'x86', 'cp37-cp37m'), PythonArtifact('linux_extra', 'armv7', '2.7'), PythonArtifact('linux_extra', 'armv7', '3.4'), PythonArtifact('linux_extra', 'armv7', '3.5'),