From ab0ab22c67d704bc3bf8b8e141225312897ce97f Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Thu, 3 Nov 2016 13:10:06 -0400 Subject: [PATCH 1/2] manylinux: Deduplicate install-skbuild.sh and rename to install-python-packages.sh --- .../install-python-packages.sh | 0 manylinux-x64/Dockerfile.in | 4 ++-- manylinux-x86/Dockerfile.in | 4 ++-- manylinux-x86/install-skbuild.sh | 5 ----- 4 files changed, 4 insertions(+), 9 deletions(-) rename manylinux-x64/install-skbuild.sh => manylinux-common/install-python-packages.sh (100%) delete mode 100755 manylinux-x86/install-skbuild.sh diff --git a/manylinux-x64/install-skbuild.sh b/manylinux-common/install-python-packages.sh similarity index 100% rename from manylinux-x64/install-skbuild.sh rename to manylinux-common/install-python-packages.sh diff --git a/manylinux-x64/Dockerfile.in b/manylinux-x64/Dockerfile.in index ce6d600..01a0e71 100644 --- a/manylinux-x64/Dockerfile.in +++ b/manylinux-x64/Dockerfile.in @@ -9,8 +9,8 @@ RUN cd /opt && \ cd admin/runit-2.1.2 && \ ./package/install -COPY manylinux-x64/install-skbuild.sh /usr/local/bin -RUN /usr/local/bin/install-skbuild.sh +COPY manylinux-common/install-python-packages.sh /usr/local/bin +RUN /usr/local/bin/install-python-packages.sh RUN yum -y install sudo diff --git a/manylinux-x86/Dockerfile.in b/manylinux-x86/Dockerfile.in index 9126f1b..7eacb85 100644 --- a/manylinux-x86/Dockerfile.in +++ b/manylinux-x86/Dockerfile.in @@ -9,8 +9,8 @@ RUN cd /opt && \ cd admin/runit-2.1.2 && \ ./package/install -COPY manylinux-x64/install-skbuild.sh /usr/local/bin -RUN /usr/local/bin/install-skbuild.sh +COPY manylinux-common/install-python-packages.sh /usr/local/bin +RUN /usr/local/bin/install-python-packages.sh RUN yum -y install sudo diff --git a/manylinux-x86/install-skbuild.sh b/manylinux-x86/install-skbuild.sh deleted file mode 100755 index dd214b7..0000000 --- a/manylinux-x86/install-skbuild.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -for PIP in /opt/python/*/bin/pip; do - $PIP install scikit-build==0.4.0 -done From 667b5c1ca762610409dc17c8b5d29d82ef638351 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Thu, 3 Nov 2016 13:11:47 -0400 Subject: [PATCH 2/2] manylinux-common/install-python-packages: Ensure latest pip is installed --- manylinux-common/install-python-packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/manylinux-common/install-python-packages.sh b/manylinux-common/install-python-packages.sh index dd214b7..9777cc9 100755 --- a/manylinux-common/install-python-packages.sh +++ b/manylinux-common/install-python-packages.sh @@ -1,5 +1,6 @@ #!/bin/bash for PIP in /opt/python/*/bin/pip; do + $PIP install --disable-pip-version-check --upgrade pip $PIP install scikit-build==0.4.0 done