From 0d154241e85183718171a5abef6ab9dd0849c4ce Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Thu, 30 Jan 2025 13:54:04 -0800 Subject: [PATCH 01/15] Eric's fixe from PR #1827 Signed-off-by: Darby Johnston --- .github/workflows/pypi-publish.yml | 3 ++- .github/workflows/python-package.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 8b130aa6de..29968216e9 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -22,7 +22,8 @@ jobs: workflow: python-package.yml workflow_conclusion: success commit: ${{ github.sha }} - name: wheels + name_is_regexp: true + name: wheel-.* path: dist - name: Download sdist from commit ${{ github.sha }} diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 54a255517f..446a7b192c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -172,9 +172,9 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-13, macos-latest] - python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*'] + python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312'] exclude: - - { os: macos-latest, python-build: 'cp37*' } + - { os: macos-latest, python-build: 'cp37' } steps: - uses: actions/checkout@v4 @@ -187,15 +187,15 @@ jobs: with: output-dir: wheelhouse env: - CIBW_BUILD: ${{ matrix.python-build }} + CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' CIBW_ARCHS_LINUX: x86_64 aarch64 CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: wheels + name: wheel-${{ matrix.os }}-${{ matrix.python-build }} path: ./wheelhouse/*.whl package_sdist: @@ -214,7 +214,7 @@ jobs: - name: Generate sdist run: python -m build -s . - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: sdist path: dist From 7efb0210daa8e6ea9037df06f075af3203100a20 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Thu, 30 Jan 2025 13:54:43 -0800 Subject: [PATCH 02/15] Update dawidd6/action-download-artifact to v8 Signed-off-by: Darby Johnston --- .github/workflows/pypi-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 29968216e9..f31bfa1bf8 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -17,7 +17,7 @@ jobs: # happen for this actual commit (the commit that the tag points to). # It also restores the files timestamps. - name: Download wheels from commit ${{ github.sha }} - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v8 with: workflow: python-package.yml workflow_conclusion: success @@ -27,7 +27,7 @@ jobs: path: dist - name: Download sdist from commit ${{ github.sha }} - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v8 with: workflow: python-package.yml workflow_conclusion: success From dcf51c17446431ce08aa94a4fbfd8ed185ce72d4 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Thu, 30 Jan 2025 14:19:37 -0800 Subject: [PATCH 03/15] Try updating pypa/cibuildwheel Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 446a7b192c..f2d0efe62a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -183,7 +183,7 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Build wheels (Python 3) - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.22.0 with: output-dir: wheelhouse env: From e18bb76188849de8077226a68dd4c491ba4e5af7 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Thu, 30 Jan 2025 17:57:39 -0800 Subject: [PATCH 04/15] Update setup-python Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f2d0efe62a..fff6712134 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -133,7 +133,7 @@ jobs: git - name: Set up Python ${{ matrix.python-version }} if: matrix.python-version != 'mingw64' - uses: actions/setup-python@v4.3.0 + uses: actions/setup-python@v5.4.0 with: python-version: ${{ matrix.python-version }} - name: Install coverage dependency @@ -206,7 +206,7 @@ jobs: with: submodules: 'recursive' - - uses: actions/setup-python@v4.3.0 + - uses: actions/setup-python@v5.4.0 - name: Install pypa/build run: python -m pip install build --user From bb43b0b2933253ff45d7ff7e18547a8ab807ac3e Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Sat, 1 Feb 2025 15:14:29 -0800 Subject: [PATCH 05/15] Try using native ARM runner Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index fff6712134..1aa97578e8 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -171,17 +171,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-latest] + os: [ubuntu-24.04-arm, windows-latest, macos-13, macos-latest] python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312'] exclude: - { os: macos-latest, python-build: 'cp37' } steps: - uses: actions/checkout@v4 - - name: Set up QEMU - if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v3 - - name: Build wheels (Python 3) uses: pypa/cibuildwheel@v2.22.0 with: From 81217fff9e437d8fa0b4db69ee3c20426f6d76a8 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 13:11:40 -0800 Subject: [PATCH 06/15] Use ubuntu-latest and ubuntu-24.04-arm Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 1aa97578e8..e294cefb73 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -171,7 +171,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04-arm, windows-latest, macos-13, macos-latest] + os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest] python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312'] exclude: - { os: macos-latest, python-build: 'cp37' } @@ -185,7 +185,6 @@ jobs: env: CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' - CIBW_ARCHS_LINUX: x86_64 aarch64 CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 From beda073294f79c41f10545854f1545366aa972cc Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 13:22:13 -0800 Subject: [PATCH 07/15] Set MACOSX_DEPLOYMENT_TARGET Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e294cefb73..46814682df 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -187,6 +187,7 @@ jobs: CIBW_SKIP: '*musllinux*' CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 + MACOSX_DEPLOYMENT_TARGET: 10.14 - uses: actions/upload-artifact@v4 with: From 1c996c92ab23bfab5ab95a65cca757673f90d35d Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 13:56:08 -0800 Subject: [PATCH 08/15] Use default images Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 46814682df..6b373a0a8b 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -185,8 +185,6 @@ jobs: env: CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 MACOSX_DEPLOYMENT_TARGET: 10.14 - uses: actions/upload-artifact@v4 From fae163ac503a6ac0b264eef04ae436f2796e8adf Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 14:12:12 -0800 Subject: [PATCH 09/15] Try setting CIBW_ARCHS_LINUX to auto Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6b373a0a8b..9595121761 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -185,6 +185,7 @@ jobs: env: CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' + CIBW_ARCHS_LINUX: auto MACOSX_DEPLOYMENT_TARGET: 10.14 - uses: actions/upload-artifact@v4 From ff991c692c11055e7fa6d114091c78e64f5278da Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 14:31:02 -0800 Subject: [PATCH 10/15] Try setting CIBW_ARCHS_LINUX explicitly Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9595121761..ac0cde6d75 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -173,6 +173,11 @@ jobs: matrix: os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest] python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312'] + include: + - os: ubuntu-latest + arch: x86_64 + - os: ubuntu-24.04-arm + arch: aarch64 exclude: - { os: macos-latest, python-build: 'cp37' } steps: @@ -185,7 +190,7 @@ jobs: env: CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' - CIBW_ARCHS_LINUX: auto + CIBW_ARCHS_LINUX: ${{ matrix.arch }} MACOSX_DEPLOYMENT_TARGET: 10.14 - uses: actions/upload-artifact@v4 From a07e66a19c4c68f341ed9ee40a72c838ed06e6e3 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 18:05:09 -0800 Subject: [PATCH 11/15] Add back ticks Signed-off-by: Darby Johnston --- .github/workflows/pypi-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index f31bfa1bf8..26336f06d7 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -23,7 +23,7 @@ jobs: workflow_conclusion: success commit: ${{ github.sha }} name_is_regexp: true - name: wheel-.* + name: `wheel-.*` path: dist - name: Download sdist from commit ${{ github.sha }} From 35d189f7a3c07c8a4be87e54638287afc0284f92 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 18:11:51 -0800 Subject: [PATCH 12/15] Set images explicitly Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index ac0cde6d75..3f5cf65ed4 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -191,6 +191,8 @@ jobs: CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' CIBW_ARCHS_LINUX: ${{ matrix.arch }} + CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 + CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 MACOSX_DEPLOYMENT_TARGET: 10.14 - uses: actions/upload-artifact@v4 From 435f190a2b2addca68e3903f6a83d63b6539a673 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 18:30:20 -0800 Subject: [PATCH 13/15] Try removing CIBW_ARCHS_LINUX Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 3f5cf65ed4..6f0352e9fc 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -190,7 +190,6 @@ jobs: env: CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' - CIBW_ARCHS_LINUX: ${{ matrix.arch }} CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 MACOSX_DEPLOYMENT_TARGET: 10.14 From fd85176316618a2bb11d308a8f888d32abc2ef75 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 18:42:18 -0800 Subject: [PATCH 14/15] Try setting CIBW_ARCHS_LINUX to native Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6f0352e9fc..1e932234dc 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -190,6 +190,7 @@ jobs: env: CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' + CIBW_ARCHS_LINUX: native CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 MACOSX_DEPLOYMENT_TARGET: 10.14 From 5cd833e8a430798561a525a0725c06900996a874 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 3 Feb 2025 19:00:18 -0800 Subject: [PATCH 15/15] Remove old code Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 1e932234dc..2c19b23d02 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -173,11 +173,6 @@ jobs: matrix: os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest] python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312'] - include: - - os: ubuntu-latest - arch: x86_64 - - os: ubuntu-24.04-arm - arch: aarch64 exclude: - { os: macos-latest, python-build: 'cp37' } steps: