From 5a486f419e001b0aed5ecfa25fb8f6efb613bdbd Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 16:40:39 +1000 Subject: [PATCH 1/8] BLD don't allow wasm wheels to be published --- .github/workflows/wheels.yml | 52 +++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 422d5e6..775a40a 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -49,18 +49,18 @@ jobs: # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026 buildplat: - [ubuntu-22.04, manylinux_x86_64, ""] - - [ubuntu-22.04, musllinux_x86_64, ""] - - [ubuntu-22.04-arm, manylinux_aarch64, ""] - - [ubuntu-22.04-arm, musllinux_aarch64, ""] - - [macos-13, macosx_x86_64, openblas] - - # targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile - - [macos-13, macosx_x86_64, accelerate] - - [macos-14, macosx_arm64, openblas] - - [macos-14, macosx_arm64, accelerate] - - [windows-2022, win_amd64, ""] - - [windows-2022, win32, ""] - - [windows-11-arm, win_arm64, ""] +# - [ubuntu-22.04, musllinux_x86_64, ""] +# - [ubuntu-22.04-arm, manylinux_aarch64, ""] +# - [ubuntu-22.04-arm, musllinux_aarch64, ""] +# - [macos-13, macosx_x86_64, openblas] +# +# # targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile +# - [macos-13, macosx_x86_64, accelerate] +# - [macos-14, macosx_arm64, openblas] +# - [macos-14, macosx_arm64, accelerate] +# - [windows-2022, win_amd64, ""] +# - [windows-2022, win32, ""] +# - [windows-11-arm, win_arm64, ""] python: ["cp311", "cp312", "cp313", "cp313t", "cp314", "cp314t", "pp311"] exclude: # Don't build PyPy 32-bit windows @@ -79,8 +79,6 @@ jobs: - buildplat: [ macos13, macosx_x86_64, openblas ] python: "cp314t" include: - - buildplat: [ ubuntu-22.04, pyodide_wasm32, "" ] - python: "cp312" - buildplat: [ ubuntu-22.04, pyodide_wasm32, "" ] python: "cp313" env: @@ -224,7 +222,7 @@ jobs: testpypi-publish: name: Publish release to TestPyPI - if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi' +# if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi' needs: [build_wheels, build_sdist] runs-on: ubuntu-latest environment: @@ -238,13 +236,18 @@ jobs: with: path: dist - - name: Publish - uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 - with: - repository-url: https://test.pypi.org/legacy/ - skip-existing: true - print-hash: true - attestations: true + - name: Remove wasm wheels + run: | + rm dist/*wasm*.whl + ls -al dist + +# - name: Publish +# uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 +# with: +# repository-url: https://test.pypi.org/legacy/ +# skip-existing: true +# print-hash: true +# attestations: true check_version: name: Ensure commit is tag before upload to PyPi @@ -292,6 +295,11 @@ jobs: with: path: dist + - name: Remove wasm wheels + run: | + rm dist/*wasm*.whl + ls -al dist + - name: Publish uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 with: From 2cf29f3567a2c0092d81ab5923fbada5bca2e282 Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 17:10:32 +1000 Subject: [PATCH 2/8] BLD don't allow wasm wheels to be published --- .github/workflows/wheels.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 775a40a..3048ef1 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -61,7 +61,7 @@ jobs: # - [windows-2022, win_amd64, ""] # - [windows-2022, win32, ""] # - [windows-11-arm, win_arm64, ""] - python: ["cp311", "cp312", "cp313", "cp313t", "cp314", "cp314t", "pp311"] + python: ["cp311"]#, "cp312", "cp313", "cp313t", "cp314", "cp314t", "pp311"] exclude: # Don't build PyPy 32-bit windows - buildplat: [windows-2022, win32, ""] @@ -238,6 +238,7 @@ jobs: - name: Remove wasm wheels run: | + ls -al rm dist/*wasm*.whl ls -al dist From c49d57d600a578994e7ea38e8894c7de935d642d Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 17:22:31 +1000 Subject: [PATCH 3/8] BLD don't allow wasm wheels to be published --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3048ef1..20a0833 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -238,8 +238,8 @@ jobs: - name: Remove wasm wheels run: | - ls -al - rm dist/*wasm*.whl + cd dist + rm *wasm*.whl ls -al dist # - name: Publish From 50db972b42599835ebb6c87351106d41d38615e1 Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 17:38:04 +1000 Subject: [PATCH 4/8] BLD don't allow wasm wheels to be published --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 20a0833..20883bb 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -239,6 +239,7 @@ jobs: - name: Remove wasm wheels run: | cd dist + ls -al rm *wasm*.whl ls -al dist From b3fd9bb0f9570a423105b498ff0d09cea401f21f Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 17:48:44 +1000 Subject: [PATCH 5/8] BLD don't allow wasm wheels to be published --- .github/workflows/wheels.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 20883bb..e6dd1cc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -240,7 +240,7 @@ jobs: run: | cd dist ls -al - rm *wasm*.whl + rm -r *wasm* ls -al dist # - name: Publish @@ -299,7 +299,9 @@ jobs: - name: Remove wasm wheels run: | - rm dist/*wasm*.whl + cd dist + ls -al + rm -r *wasm* ls -al dist - name: Publish From b63532823a06e70addb3cee56e6782fda4ce3cb7 Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 18:00:08 +1000 Subject: [PATCH 6/8] BLD don't allow wasm wheels to be published --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e6dd1cc..9862af9 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -302,7 +302,7 @@ jobs: cd dist ls -al rm -r *wasm* - ls -al dist + ls -al - name: Publish uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 From e8e298afe3f95ddef171252a476f2e2e7c1e5da2 Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 18:40:56 +1000 Subject: [PATCH 7/8] BLD don't allow wasm wheels to be published --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9862af9..b333d70 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -241,7 +241,7 @@ jobs: cd dist ls -al rm -r *wasm* - ls -al dist + ls -al # - name: Publish # uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 From 54d7a23c58105485cc7e26062ae1a66f3cc5eba6 Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 28 Aug 2025 19:31:46 +1000 Subject: [PATCH 8/8] BLD: remove wasm wheels before deployment --- .github/workflows/wheels.yml | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b333d70..5ff5c94 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -49,19 +49,19 @@ jobs: # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026 buildplat: - [ubuntu-22.04, manylinux_x86_64, ""] -# - [ubuntu-22.04, musllinux_x86_64, ""] -# - [ubuntu-22.04-arm, manylinux_aarch64, ""] -# - [ubuntu-22.04-arm, musllinux_aarch64, ""] -# - [macos-13, macosx_x86_64, openblas] -# -# # targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile -# - [macos-13, macosx_x86_64, accelerate] -# - [macos-14, macosx_arm64, openblas] -# - [macos-14, macosx_arm64, accelerate] -# - [windows-2022, win_amd64, ""] -# - [windows-2022, win32, ""] -# - [windows-11-arm, win_arm64, ""] - python: ["cp311"]#, "cp312", "cp313", "cp313t", "cp314", "cp314t", "pp311"] + - [ubuntu-22.04, musllinux_x86_64, ""] + - [ubuntu-22.04-arm, manylinux_aarch64, ""] + - [ubuntu-22.04-arm, musllinux_aarch64, ""] + - [macos-13, macosx_x86_64, openblas] + + # targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile + - [macos-13, macosx_x86_64, accelerate] + - [macos-14, macosx_arm64, openblas] + - [macos-14, macosx_arm64, accelerate] + - [windows-2022, win_amd64, ""] + - [windows-2022, win32, ""] + - [windows-11-arm, win_arm64, ""] + python: ["cp311", "cp312", "cp313", "cp313t", "cp314", "cp314t", "pp311"] exclude: # Don't build PyPy 32-bit windows - buildplat: [windows-2022, win32, ""] @@ -222,7 +222,7 @@ jobs: testpypi-publish: name: Publish release to TestPyPI -# if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi' + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi' needs: [build_wheels, build_sdist] runs-on: ubuntu-latest environment: @@ -243,13 +243,13 @@ jobs: rm -r *wasm* ls -al -# - name: Publish -# uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 -# with: -# repository-url: https://test.pypi.org/legacy/ -# skip-existing: true -# print-hash: true -# attestations: true + - name: Publish + uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 + with: + repository-url: https://test.pypi.org/legacy/ + skip-existing: true + print-hash: true + attestations: true check_version: name: Ensure commit is tag before upload to PyPi