From 86259aa4c39525159684c93f588f4610085bde22 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 1 Mar 2022 20:46:11 -0500 Subject: [PATCH 1/6] bump to v1.2.1 for development --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bff73060a..e0e01eab3 100755 --- a/setup.py +++ b/setup.py @@ -14,8 +14,8 @@ from setuptools.command.test import test as TestCommand MAJOR = 1 -MINOR = 3 -MICRO = 0 +MINOR = 2 +MICRO = 1 ISRELEASED = False VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) From 078dfd43460e9bbf5312c3912e18e2268234a9a6 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 1 Mar 2022 20:42:54 -0500 Subject: [PATCH 2/6] build python 3.7 wheels for aarch64 --- .github/workflows/wheel_tests_and_release.yml | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheel_tests_and_release.yml b/.github/workflows/wheel_tests_and_release.yml index 682beaca0..80d958e43 100644 --- a/.github/workflows/wheel_tests_and_release.yml +++ b/.github/workflows/wheel_tests_and_release.yml @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-18.04] - cibw_python: [ "cp38-*" , "cp39-*", "cp310-*"] + cibw_python: [ "cp37-*" , "cp38-*" , "cp39-*", "cp310-*"] cibw_manylinux: [ manylinux2014 ] steps: - uses: actions/checkout@v2 diff --git a/pyproject.toml b/pyproject.toml index 1fc9fa2cb..f4f9ad454 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,7 @@ requires = [ # numpy 1.19 was the first minor release to provide aarch64 wheels, but # wheels require fixes contained in numpy 1.19.2 + "numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64'", "numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'", # aarch64 for py39 is covered by default requirement below From 532018415618199ae3d21e102e47df8cad90d920 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 1 Mar 2022 20:53:46 -0500 Subject: [PATCH 3/6] add PIP_PREFER_BINARY flag --- .github/workflows/wheel_tests_and_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheel_tests_and_release.yml b/.github/workflows/wheel_tests_and_release.yml index 80d958e43..875bd56c5 100644 --- a/.github/workflows/wheel_tests_and_release.yml +++ b/.github/workflows/wheel_tests_and_release.yml @@ -9,6 +9,7 @@ env: # CIBW_BEFORE_BUILD: pip install cython CIBW_TEST_REQUIRES: pytest CIBW_TEST_COMMAND: pytest --pyargs pywt + CIBW_ENVIRONMENT: PIP_PREFER_BINARY=1 jobs: From ec515234693b2b8d986636011f3ec28c1ab0cc8d Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 1 Mar 2022 21:07:34 -0500 Subject: [PATCH 4/6] bump manylinux version on linux x86_64 i686 stays on manylinux2010 to match numpy1.17.3 --- .github/workflows/wheel_tests_and_release.yml | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheel_tests_and_release.yml b/.github/workflows/wheel_tests_and_release.yml index 875bd56c5..c13a6cc74 100644 --- a/.github/workflows/wheel_tests_and_release.yml +++ b/.github/workflows/wheel_tests_and_release.yml @@ -20,15 +20,24 @@ jobs: fail-fast: false matrix: os: [ubuntu-18.04] - cibw_python: [ "cp37-*", "cp38-*" ] - cibw_manylinux: [ manylinux1 ] + cibw_python: [ "cp38-*", "cp39-*" ] + cibw_manylinux: [ manylinux2014 ] + cibw_arch: [ "x86_64", "i686" ] include: + # manylinux2010 for Python 3.7 cases + - os: ubuntu-18.04 + cibw_python: "cp37-*" + cibw_manylinux: manylinux2010 + cibw_arch: "x86_64" - os: ubuntu-18.04 - cibw_python: "cp39-*" + cibw_python: "cp37-*" cibw_manylinux: manylinux2010 + cibw_arch: "i686" + # no i686 NumPy 1.21.x wheel for Python 3.10 - os: ubuntu-18.04 cibw_python: "cp310-*" cibw_manylinux: manylinux2014 + cibw_arch: "x86_64" steps: - uses: actions/checkout@v2 with: @@ -45,9 +54,9 @@ jobs: python -m cibuildwheel --output-dir dist env: CIBW_BUILD: ${{ matrix.cibw_python }} - CIBW_ARCHS_LINUX: x86_64 i686 + CIBW_ARCHS_LINUX: ${{ matrix.cibw_arch }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.cibw_manylinux }} - CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.cibw_manylinux }} + CIBW_MANYLINUX_I686_IMAGE: "manylinux2010" - uses: actions/upload-artifact@v2 with: name: wheels @@ -85,7 +94,6 @@ jobs: CIBW_ARCHS_LINUX: aarch64 CIBW_SKIP: "*-musllinux_*" CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.cibw_manylinux }} - CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.cibw_manylinux }} - uses: actions/upload-artifact@v2 with: name: wheels From 49b9586ba80c67bff1a931fea0a9feb019e65046 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 1 Mar 2022 21:10:32 -0500 Subject: [PATCH 5/6] skip musllinux cases on linux x86_64 and i686 too --- .github/workflows/wheel_tests_and_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheel_tests_and_release.yml b/.github/workflows/wheel_tests_and_release.yml index c13a6cc74..a2b3c7b67 100644 --- a/.github/workflows/wheel_tests_and_release.yml +++ b/.github/workflows/wheel_tests_and_release.yml @@ -55,6 +55,7 @@ jobs: env: CIBW_BUILD: ${{ matrix.cibw_python }} CIBW_ARCHS_LINUX: ${{ matrix.cibw_arch }} + CIBW_SKIP: "*-musllinux_*" CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.cibw_manylinux }} CIBW_MANYLINUX_I686_IMAGE: "manylinux2010" - uses: actions/upload-artifact@v2 From af24d8602d12cd5e129cd17af8aaba6869b997d4 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 1 Mar 2022 21:15:02 -0500 Subject: [PATCH 6/6] update job name to include the architecture --- .github/workflows/wheel_tests_and_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel_tests_and_release.yml b/.github/workflows/wheel_tests_and_release.yml index a2b3c7b67..afc4d1aab 100644 --- a/.github/workflows/wheel_tests_and_release.yml +++ b/.github/workflows/wheel_tests_and_release.yml @@ -14,7 +14,7 @@ env: jobs: build_linux_37_and_above_wheels: - name: Build python ${{ matrix.cibw_python }} wheels on ${{ matrix.os }} + name: Build python ${{ matrix.cibw_python }} ${{ matrix.cibw_arch }} wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: fail-fast: false