From 062ac855661ac9f2941d340af80273d4afa49832 Mon Sep 17 00:00:00 2001 From: Ruben Vorderman Date: Tue, 30 Mar 2021 08:34:21 +0200 Subject: [PATCH 1/7] Add test for aarch64 --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5a8924f..cf825fe0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,30 @@ jobs: - name: Upload coverage report uses: codecov/codecov-action@v1 + test-arch: + name: Test on ${{ matrix.distro }} ${{ matrix.arch }} + runs-on: "ubuntu-latest" + needs: lint + strategy: + matrix: + distro: [ "ubuntu20.04" ] + arch: ["aarch64"] + steps: + - uses: actions/checkout@v2.3.4 + with: + submodules: recursive + - uses: uraimo/run-on-arch-action@v2.0.9 + name: Build & run test + with: + arch: ${{ matrix.arch }} + distro: ${{ matrix.distro }} + install: | + apt-get update -q -y + apt-get install -q -y python3 python3-pip build-essential gcc binutils automake autoconf + run: | + python3 -m pip install -U setuptools pip wheel tox + tox -e py3 + # Test if the python-isal conda package can be build. Which is linked # dynamically to the conda isa-l package. test-dynamic: From 2bb9453048aef3569ce82d88bc2f885a098cb0a8 Mon Sep 17 00:00:00 2001 From: Ruben Vorderman Date: Tue, 30 Mar 2021 08:50:57 +0200 Subject: [PATCH 2/7] Install libtool --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf825fe0..4f41d10c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,10 +117,10 @@ jobs: distro: ${{ matrix.distro }} install: | apt-get update -q -y - apt-get install -q -y python3 python3-pip build-essential gcc binutils automake autoconf + apt-get install -q -y python3 python3-pip gcc binutils automake autoconf libtool run: | python3 -m pip install -U setuptools pip wheel tox - tox -e py3 + tox # Test if the python-isal conda package can be build. Which is linked # dynamically to the conda isa-l package. From 3b315a5a2c22fed84d9fe48beadc6bb2f98ff939 Mon Sep 17 00:00:00 2001 From: Ruben Vorderman Date: Tue, 30 Mar 2021 09:58:59 +0200 Subject: [PATCH 3/7] Enable aarch64 wheel building --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f41d10c..5011d2c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -177,11 +177,18 @@ jobs: - name: Install nasm (Windows) uses: ilammy/setup-nasm@v1.2.0 if: runner.os == 'Windows' + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v1.0.1 + with: + platforms: arm64 - name: Build wheels run: cibuildwheel --output-dir dist env: CIBW_SKIP: "*-win32 *-manylinux_i686" # Skip 32 bit. CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014" + CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux2014" + CIBW_ARCHS_LINUX: "x86_64 aarch64" # Fully test the build wheels again. CIBW_TEST_REQUIRES: "pytest" # Simple test that requires the project to be build correctly From c82f542d5771dc2318152c044d4abb20985ff607 Mon Sep 17 00:00:00 2001 From: Ruben Vorderman Date: Tue, 30 Mar 2021 09:59:41 +0200 Subject: [PATCH 4/7] Test deploy --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5011d2c9..8265a445 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,7 +154,7 @@ jobs: PYTHON_ISAL_LINK_DYNAMIC: True deploy: - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ${{ matrix.os }} needs: [lint, package-checks, test-static, test-dynamic] strategy: From 4d1b38b6a687850b2cba8231f3c5dfcd40942232 Mon Sep 17 00:00:00 2001 From: Ruben Vorderman Date: Tue, 30 Mar 2021 10:33:37 +0200 Subject: [PATCH 5/7] Only run arch check on main/develop --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8265a445..2b6f3eea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,6 +99,7 @@ jobs: uses: codecov/codecov-action@v1 test-arch: + if: startsWith(github.ref, 'refs/tags') || github.ref == refs/heads/develop || github.ref == refs/heads/main name: Test on ${{ matrix.distro }} ${{ matrix.arch }} runs-on: "ubuntu-latest" needs: lint @@ -154,9 +155,9 @@ jobs: PYTHON_ISAL_LINK_DYNAMIC: True deploy: - #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ${{ matrix.os }} - needs: [lint, package-checks, test-static, test-dynamic] + needs: [lint, package-checks, test-static, test-dynamic, test-arch] strategy: matrix: os: ["macos-latest", "ubuntu-latest", "windows-latest"] From d65ccd12941327d6d9073aabe9758b552525cf68 Mon Sep 17 00:00:00 2001 From: Ruben Vorderman Date: Tue, 30 Mar 2021 12:04:04 +0200 Subject: [PATCH 6/7] Add missing quotes --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b6f3eea..41ae68c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: uses: codecov/codecov-action@v1 test-arch: - if: startsWith(github.ref, 'refs/tags') || github.ref == refs/heads/develop || github.ref == refs/heads/main + if: startsWith(github.ref, 'refs/tags') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' name: Test on ${{ matrix.distro }} ${{ matrix.arch }} runs-on: "ubuntu-latest" needs: lint From 2545acfaa14f725ed5bf2544d9fb9ff17c9e8153 Mon Sep 17 00:00:00 2001 From: Ruben Vorderman Date: Tue, 30 Mar 2021 12:17:09 +0200 Subject: [PATCH 7/7] Update changelog --- CHANGELOG.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a31a65b9..c1d689ad 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,9 @@ Changelog version 0.9.0-dev ----------------- ++ Fix a bug where a AttributeError was triggered when zlib.Z_RLE or + zlib.Z_FIXED were not present. ++ Add support for Linux aarch64 builds. + Add support for pypy by adding pypy tests to the CI and setting up wheel building support.