From cb79bc79b05d3cf43375445ac95536ae276fc61b Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Wed, 1 Sep 2021 16:40:17 -0400 Subject: [PATCH 1/2] ci: restore building 'manylinux1' wheels. Toward #83. --- scripts/manylinux/build.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/manylinux/build.sh b/scripts/manylinux/build.sh index 8276a887..7bf9a4b7 100755 --- a/scripts/manylinux/build.sh +++ b/scripts/manylinux/build.sh @@ -21,12 +21,22 @@ MANYLINUX_DIR=$(echo $(cd $(dirname ${0}); pwd)) SCRIPTS_DIR=$(dirname ${MANYLINUX_DIR}) REPO_ROOT=$(dirname ${SCRIPTS_DIR}) -docker pull quay.io/pypa/manylinux2010_x86_64 -docker pull quay.io/pypa/manylinux2014_x86_64 cd $REPO_ROOT git submodule update --init --recursive +# Note: PyPA's support for the `manylinux1` image ends on 2022-01-01. +# See: https://github.com/pypa/manylinux/issues/994 +docker pull quay.io/pypa/manylinux1_x86_64 +docker run \ + --rm \ + --interactive \ + --volume ${REPO_ROOT}:/var/code/python-crc32c/ \ + --env BUILD_PYTHON=${BUILD_PYTHON} \ + quay.io/pypa/manylinux1_x86_64 \ + /var/code/python-crc32c/scripts/manylinux/build_on_centos.sh + +docker pull quay.io/pypa/manylinux2010_x86_64 docker run \ --rm \ --interactive \ @@ -35,6 +45,7 @@ docker run \ quay.io/pypa/manylinux2010_x86_64 \ /var/code/python-crc32c/scripts/manylinux/build_on_centos.sh +docker pull quay.io/pypa/manylinux2014_x86_64 docker run \ --rm \ --interactive \ @@ -44,6 +55,7 @@ docker run \ /var/code/python-crc32c/scripts/manylinux/build_on_centos.sh docker run --rm --privileged hypriot/qemu-register +docker pull quay.io/pypa/manylinux2014_aarch64 docker run \ --rm \ --interactive \ From a95f4b646a45a98e08494caa1c27f8ce5d591c14 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Wed, 1 Sep 2021 17:00:23 -0400 Subject: [PATCH 2/2] ci: skip 'manylinux1' build on CI for Python 3.10 That image does not support Python 3.10, nor will it ever. --- scripts/manylinux/build.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/manylinux/build.sh b/scripts/manylinux/build.sh index 7bf9a4b7..6dfb4582 100755 --- a/scripts/manylinux/build.sh +++ b/scripts/manylinux/build.sh @@ -25,16 +25,19 @@ REPO_ROOT=$(dirname ${SCRIPTS_DIR}) cd $REPO_ROOT git submodule update --init --recursive -# Note: PyPA's support for the `manylinux1` image ends on 2022-01-01. +# Note: PyPA's support for the 'manylinux1' image ends on 2022-01-01. # See: https://github.com/pypa/manylinux/issues/994 -docker pull quay.io/pypa/manylinux1_x86_64 -docker run \ - --rm \ - --interactive \ - --volume ${REPO_ROOT}:/var/code/python-crc32c/ \ - --env BUILD_PYTHON=${BUILD_PYTHON} \ - quay.io/pypa/manylinux1_x86_64 \ - /var/code/python-crc32c/scripts/manylinux/build_on_centos.sh +# No 3.10 support for 'manylinux1'. +if [[ "${BUILD_PYTHON}" != "3.10"* ]]; then + docker pull quay.io/pypa/manylinux1_x86_64 + docker run \ + --rm \ + --interactive \ + --volume ${REPO_ROOT}:/var/code/python-crc32c/ \ + --env BUILD_PYTHON=${BUILD_PYTHON} \ + quay.io/pypa/manylinux1_x86_64 \ + /var/code/python-crc32c/scripts/manylinux/build_on_centos.sh +fi docker pull quay.io/pypa/manylinux2010_x86_64 docker run \