From 3fed4aae40a7a9730552a275a891a51c50f407cf Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Sat, 15 Jun 2024 11:38:34 +0200 Subject: [PATCH 1/3] Build: Upgrade cibuildwheel and include Py3.13 wheels. --- .github/workflows/wheels.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index afcaa6cd7..b5253c991 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -83,16 +83,16 @@ jobs: - uses: actions/checkout@v4 - name: Install cibuildwheel # Nb. keep cibuildwheel version pin consistent with job below - run: pipx install cibuildwheel==2.15.0 + run: pipx install cibuildwheel==2.19.1 - id: set-matrix run: | MATRIX=$( { - cibuildwheel --print-build-identifiers --platform linux \ + cibuildwheel --print-build-identifiers --platform linux --prerelease-pythons \ | jq -nRc '{"only": inputs, "os": "ubuntu-latest"}' \ - && cibuildwheel --print-build-identifiers --platform macos \ + && cibuildwheel --print-build-identifiers --platform macos --prerelease-pythons \ | jq -nRc '{"only": inputs, "os": "macos-latest"}' \ - && cibuildwheel --print-build-identifiers --platform windows \ + && cibuildwheel --print-build-identifiers --platform windows --prerelease-pythons \ | jq -nRc '{"only": inputs, "os": "windows-2019"}' } | jq -sc ) @@ -133,13 +133,13 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.19.1 with: only: ${{ matrix.only }} - name: Build old Linux wheels if: contains(matrix.only, '-manylinux_') && startsWith(matrix.only, 'cp36-') && (contains(matrix.only, 'i686') || contains(matrix.only, 'x86_64')) - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.19.1 env: CIBW_MANYLINUX_i686_IMAGE: manylinux1 CIBW_MANYLINUX_X86_64_IMAGE: manylinux1 @@ -149,7 +149,7 @@ jobs: - name: Build faster Linux wheels # also build wheels with the most recent manylinux images and gcc if: runner.os == 'Linux' && !contains(matrix.only, 'i686') - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.19.1 env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 From 689714875cfccdaa18f8b680ab374cb2debcc61d Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Sat, 15 Jun 2024 11:56:26 +0200 Subject: [PATCH 2/3] Build: Test wheels after build. --- .github/workflows/wheels.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b5253c991..9b91553dd 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -164,6 +164,12 @@ jobs: with: only: ${{ matrix.only }} + - name: Test wheels + run: | + ls ./wheelhouse/*.whl + pip install -f ./wheelhouse lxml + python test.py -vv + - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: path: ./wheelhouse/*.whl From c3b03c6dc2d7b8c4231e0a5c69bf0538816d3a68 Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Sat, 15 Jun 2024 16:40:50 +0200 Subject: [PATCH 3/3] Build: Remove test step again. Should be done by cibuildwheel. --- .github/workflows/wheels.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9b91553dd..b5253c991 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -164,12 +164,6 @@ jobs: with: only: ${{ matrix.only }} - - name: Test wheels - run: | - ls ./wheelhouse/*.whl - pip install -f ./wheelhouse lxml - python test.py -vv - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: path: ./wheelhouse/*.whl