From 8ad158c976817d4645acf96498c60405a61d296a Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 24 Oct 2019 10:17:00 -0400 Subject: [PATCH 1/2] Revert "manylinux: Update scikit-build from 0.8.1 to 0.9.0" This reverts commit 8eecfcacb2c5d5ab37ec3cd63887987cc2e4ee83. scikit-build still has an important regression as described in https://github.com/scikit-build/scikit-build/issues/415 --- manylinux-common/install-python-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manylinux-common/install-python-packages.sh b/manylinux-common/install-python-packages.sh index af13bf3..cc2c90e 100755 --- a/manylinux-common/install-python-packages.sh +++ b/manylinux-common/install-python-packages.sh @@ -2,5 +2,5 @@ for PIP in /opt/python/*/bin/pip; do $PIP install --disable-pip-version-check --upgrade pip - $PIP install scikit-build==0.10.0 + $PIP install scikit-build==0.8.1 done From d7918209491b95ef45e27c4fea4eb8bd40c2466f Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 24 Oct 2019 10:19:36 -0400 Subject: [PATCH 2/2] manylinux: pull from upstream manylinux1 image Python 3.8.0 final has been released, and the scikitbuild fork with 3.8 pre-releases is no longer needed. --- manylinux1-x64/Dockerfile.in | 2 +- manylinux1-x86/Dockerfile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manylinux1-x64/Dockerfile.in b/manylinux1-x64/Dockerfile.in index 150fbc9..940c45c 100644 --- a/manylinux1-x64/Dockerfile.in +++ b/manylinux1-x64/Dockerfile.in @@ -1,4 +1,4 @@ -FROM scikitbuild/manylinux1_x86_64:91cb02fb8 +FROM quay.io/pypa/manylinux1_x86_64:latest MAINTAINER Matt McCormick "matt.mccormick@kitware.com" ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64 diff --git a/manylinux1-x86/Dockerfile.in b/manylinux1-x86/Dockerfile.in index 31d9c06..ef88f21 100644 --- a/manylinux1-x86/Dockerfile.in +++ b/manylinux1-x86/Dockerfile.in @@ -1,4 +1,4 @@ -FROM scikitbuild/manylinux1_i686:91cb02fb8 +FROM quay.io/pypa/manylinux1_i686:latest MAINTAINER Matt McCormick "matt.mccormick@kitware.com" ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86