From ad23b05f142e11c56a9c3b73a0067e01781bbcb7 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 16 Nov 2024 17:50:54 +0100 Subject: [PATCH 1/2] feat: add manylinux_2_31 armv7l wheel --- .github/workflows/build.yml | 6 ++- README.rst | 51 ++++++++++--------- .../manylinux-build-and-install-openssl.sh | 2 +- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85c05a11..377cca02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,6 +84,10 @@ jobs: arch: "s390x" build: "musllinux_" use_qemu: true + - os: ubuntu-latest + arch: "armv7l" + build: "manylinux_" + use_qemu: true - os: ubuntu-latest arch: "armv7l" build: "musllinux_" @@ -118,7 +122,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@v2.21 + uses: pypa/cibuildwheel@main if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}" diff --git a/README.rst b/README.rst index 07fb35b7..f1b25029 100644 --- a/README.rst +++ b/README.rst @@ -46,31 +46,32 @@ The following platforms are supported with binary wheels: .. table:: - +---------------+--------------------------+ - | OS | Arch | - +===============+==========================+ - | Windows | | 64-bit | - | | | 32-bit | - +---------------+--------------------------+ - | Linux Intel | | manylinux2010+ 64-bit | - | | | musllinux_1_1+ 64-bit | - | | | manylinux2010+ 32-bit | - | | | musllinux_1_1+ 32-bit | - +---------------+--------------------------+ - | Linux ARM | | manylinux2014+ AArch64 | - | | | musllinux_1_1+ AArch64 | - | | | musllinux_1_2+ armv7l | - +---------------+--------------------------+ - | Linux PowerPC | | manylinux2014+ ppc64le | - | | | musllinux_1_1+ ppc64le | - +---------------+--------------------------+ - | Linux IBM Z | | manylinux2014+ s390x | - | | | musllinux_1_1+ s390x | - +---------------+--------------------------+ - | macOS 10.10+ | Intel | - +---------------+--------------------------+ - | macOS 11+ | Apple Silicon | - +---------------+--------------------------+ + +---------------+---------------------------+ + | OS | Arch | + +===============+===========================+ + | Windows | | 64-bit | + | | | 32-bit | + +---------------+---------------------------+ + | Linux Intel | | manylinux2010+ x86_64 | + | | | musllinux_1_1+ x86_64 | + | | | manylinux2010+ i686 | + | | | musllinux_1_1+ i686 | + +---------------+---------------------------+ + | Linux ARM | | manylinux2014+ AArch64 | + | | | musllinux_1_1+ AArch64 | + | | | manylinux_2_31+ armv7l | + | | | musllinux_1_2+ armv7l | + +---------------+---------------------------+ + | Linux PowerPC | | manylinux2014+ ppc64le | + | | | musllinux_1_1+ ppc64le | + +---------------+---------------------------+ + | Linux IBM Z | | manylinux2014+ s390x | + | | | musllinux_1_1+ s390x | + +---------------+---------------------------+ + | macOS 10.10+ | Intel | + +---------------+---------------------------+ + | macOS 11+ | Apple Silicon | + +---------------+---------------------------+ The last version to provide ``manylinux1`` wheels was ``3.22.x``. The last version to provide Python 2 to Python 3.6 support was ``3.28.x``. diff --git a/scripts/manylinux-build-and-install-openssl.sh b/scripts/manylinux-build-and-install-openssl.sh index 924cc52a..9f7ace17 100755 --- a/scripts/manylinux-build-and-install-openssl.sh +++ b/scripts/manylinux-build-and-install-openssl.sh @@ -33,7 +33,7 @@ if ! perl -e 'use 5.10.0' &> /dev/null; then popd export PATH=/tmp/perl-openssl/bin:${PATH} else - if [ "${AUDITWHEEL_PLAT:0:9}" == "manylinux" ]; then + if [ "${AUDITWHEEL_PLAT:0:9}" == "manylinux" ] && command -v yum >/dev/null 2>&1; then # more perl modules are needed than the bare minimum already installed in CentOS # c.f. https://github.com/openssl/openssl/blob/openssl-3.0.0/NOTES-PERL.md#general-notes yum -y install perl-core From 200150d8700dc1b60d9844e0e5e92c8ed7f59eee Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 23 Nov 2024 01:52:29 -0500 Subject: [PATCH 2/2] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 377cca02..28f15d51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,7 +122,7 @@ jobs: if: matrix.use_qemu && fromJSON(env.USE_QEMU) - name: Build wheels - uses: pypa/cibuildwheel@main + uses: pypa/cibuildwheel@v2.22 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU) env: CIBW_ARCHS: "${{ matrix.arch }}"