From 5f83a435df2ecfe647c40c72051a4f6f4e5cd7b0 Mon Sep 17 00:00:00 2001 From: Patrick Avery Date: Thu, 19 Nov 2020 07:41:45 -0600 Subject: [PATCH 1/2] Bump python dependency versions cibuildwheel: 1.5.5 => 1.6.4 numpy: 1.18.5 => 1.19.4 cibuildwheel >= 1.6.0 is needed to build python 3.9 wheels. Signed-off-by: Patrick Avery --- scripts/github-actions/before_cibuildwheel.sh | 2 +- scripts/github-actions/build.sh | 2 +- scripts/github-actions/install.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/github-actions/before_cibuildwheel.sh b/scripts/github-actions/before_cibuildwheel.sh index 60a15fb..168e007 100644 --- a/scripts/github-actions/before_cibuildwheel.sh +++ b/scripts/github-actions/before_cibuildwheel.sh @@ -2,7 +2,7 @@ set -ev # We must install numpy for each wheel... -pip install numpy==1.18.5 +pip install numpy==1.19.4 if [[ "$(uname)" != "Linux" ]] && [[ "$(uname)" != "Darwin" ]]; then # Windows links to the python libraries, so we need to re-build diff --git a/scripts/github-actions/build.sh b/scripts/github-actions/build.sh index 4f6a732..4bb57e8 100644 --- a/scripts/github-actions/build.sh +++ b/scripts/github-actions/build.sh @@ -8,7 +8,7 @@ fi if [[ "$(uname)" == "Linux" ]]; then # We must build using an older toolchain. Use docker to accomplish this. - docker run --entrypoint=bash --rm -v $PWD:/project $CIBW_MANYLINUX_X86_64_IMAGE -c 'export PATH=/opt/python/cp37-cp37m/bin:$PATH && pip install numpy==1.18.5 && mkdir -p /project/build && cd /project/build && cmake .. -DPACKAGE_TESTS=OFF -DBUILD_PYTHON=ON && make' + docker run --entrypoint=bash --rm -v $PWD:/project $CIBW_MANYLINUX_X86_64_IMAGE -c 'export PATH=/opt/python/cp37-cp37m/bin:$PATH && pip install numpy==1.19.4 && mkdir -p /project/build && cd /project/build && cmake .. -DPACKAGE_TESTS=OFF -DBUILD_PYTHON=ON && make' else # Mac and Windows... mkdir -p build diff --git a/scripts/github-actions/install.sh b/scripts/github-actions/install.sh index 9f02b85..fadf1cf 100644 --- a/scripts/github-actions/install.sh +++ b/scripts/github-actions/install.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash set -ev -pip install cibuildwheel==1.5.5 +pip install cibuildwheel==1.6.4 if [[ $RUNNER_OS == "Windows" ]]; then choco install -y swig --version=3.0.12 - pip install wheel numpy==1.18.5 + pip install wheel numpy==1.19.4 elif [[ $RUNNER_OS == "macOS" ]]; then brew install swig - pip install wheel numpy==1.18.5 + pip install wheel numpy==1.19.4 fi From 6b3feda8f7be95f85d25488db12979c5315d5660 Mon Sep 17 00:00:00 2001 From: Patrick Avery Date: Thu, 19 Nov 2020 09:01:07 -0600 Subject: [PATCH 2/2] Do not build wheels for python 3.5 It reached its end of life on 2020-09-13, and it doesn't work for newer versions of numpy. Signed-off-by: Patrick Avery --- .github/workflows/build_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 1c74901..1de2937 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -3,8 +3,8 @@ name: Build Wheels on: [push, pull_request] env: - # Don't build python 2.7, pypy, or 32-bit wheels - CIBW_SKIP: "cp27-* pp* *-manylinux_i686 *-win32" + # Only support 64-bit cpython >= 3.6 + CIBW_SKIP: "cp27-* cp35-* pp* *-manylinux_i686 *-win32" # Run this script before each build... CIBW_BEFORE_BUILD: bash ./scripts/github-actions/before_cibuildwheel.sh