From 36ca540f4abf908fb4e109c730ca91b3afe66898 Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Thu, 18 Jun 2026 12:03:43 +0200 Subject: [PATCH 1/8] Chore: Update cibuildwheel to v3. Remove pypi upload for now. --- .github/workflows/main.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d1e309bd2..5700eeee8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: main on: push: - branches: ["main"] + branches: ["main", "fix-build"] jobs: macos_wheel: @@ -42,7 +42,7 @@ jobs: with: submodules: recursive - name: build wheels - uses: pypa/cibuildwheel@v2.23.2 + uses: pypa/cibuildwheel@v3 env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} @@ -67,7 +67,7 @@ jobs: with: submodules: recursive - name: build wheels - uses: pypa/cibuildwheel@v2.23.2 + uses: pypa/cibuildwheel@v3 env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} @@ -92,7 +92,7 @@ jobs: with: submodules: recursive - name: build wheels - uses: pypa/cibuildwheel@v2.23.2 + uses: pypa/cibuildwheel@v3 env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} @@ -123,18 +123,18 @@ jobs: retention-days: 1 - upload_pypi: - needs: [macos_wheel, macos_wheel-m1, linux_wheel, windows_wheel, source_dist] - runs-on: ubuntu-latest - permissions: - id-token: write - steps: - - uses: actions/download-artifact@v4 - with: - pattern: wheels-* - merge-multiple: true - path: dist - - - uses: pypa/gh-action-pypi-publish@release/v1 - with: - skip-existing: true + # upload_pypi: + # needs: [macos_wheel, macos_wheel-m1, linux_wheel, windows_wheel, source_dist] + # runs-on: ubuntu-latest + # permissions: + # id-token: write + # steps: + # - uses: actions/download-artifact@v4 + # with: + # pattern: wheels-* + # merge-multiple: true + # path: dist + + # - uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # skip-existing: true From 25cc8541bd3c2c3099dad61672f0b916561f07d9 Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Thu, 18 Jun 2026 12:05:40 +0200 Subject: [PATCH 2/8] Chore: Update cibuildwheel to v4.1.0 --- .github/workflows/main.yml | 6 +++--- .gitignore | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5700eeee8..28a39b01f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: with: submodules: recursive - name: build wheels - uses: pypa/cibuildwheel@v3 + uses: pypa/cibuildwheel@v4.1.0 env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} @@ -67,7 +67,7 @@ jobs: with: submodules: recursive - name: build wheels - uses: pypa/cibuildwheel@v3 + uses: pypa/cibuildwheel@v4.1.0 env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} @@ -92,7 +92,7 @@ jobs: with: submodules: recursive - name: build wheels - uses: pypa/cibuildwheel@v3 + uses: pypa/cibuildwheel@v4.1.0 env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} diff --git a/.gitignore b/.gitignore index 8d55e5683..80dda6ca8 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ docs/source/_generated **/CMakeFiles/ **/Makefile **/cmake_install.cmake + +# +examples/not_upload/ From cb8e3990ccc86ba20ece9674ff5a379f53dc053b Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Wed, 24 Jun 2026 12:35:48 +0200 Subject: [PATCH 3/8] Chore: Fix link in docs and update last remaining cibuildwheel action --- .github/workflows/main.yml | 2 +- docs/source/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28a39b01f..c4aea230b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: with: submodules: recursive - name: build wheels - uses: pypa/cibuildwheel@v2.23.2 + uses: pypa/cibuildwheel@v4.1.0 env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} diff --git a/docs/source/conf.py b/docs/source/conf.py index c86207e02..2c26a5d50 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -48,7 +48,7 @@ "icon_links": [ { "name": "GitHub", - "url": "https://github.com/tataratat/splinepy", + "url": "https://github.com/isosuite/splinepy", "icon": "fa-brands fa-square-github", }, { From bb453de297e15a867aaedc348c25c6f90424a9bb Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Wed, 24 Jun 2026 13:00:35 +0200 Subject: [PATCH 4/8] Chore: update more actions --- .github/workflows/main.yml | 48 ++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4aea230b..24c3d2680 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: SPLINEPY_GITHUB_ACTIONS_BUILD: True SKBUILD_INSTALL_COMPONENTS: PythonModule - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: wheels-macos-15-intel-${{ strategy.job-index }} path: ./wheelhouse/*.whl @@ -49,7 +49,7 @@ jobs: SPLINEPY_GITHUB_ACTIONS_BUILD: True SKBUILD_INSTALL_COMPONENTS: PythonModule - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: wheels-macos-${{ strategy.job-index }} path: ./wheelhouse/*.whl @@ -63,7 +63,7 @@ jobs: cw_build: ["cp310*many*", "cp311*many*", "cp312*many*", "cp313*many*", "cp314*many*"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: recursive - name: build wheels @@ -74,7 +74,7 @@ jobs: SPLINEPY_GITHUB_ACTIONS_BUILD: True SKBUILD_INSTALL_COMPONENTS: PythonModule - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: wheels-linux-${{ strategy.job-index }} path: ./wheelhouse/*.whl @@ -88,7 +88,7 @@ jobs: cw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: recursive - name: build wheels @@ -100,7 +100,7 @@ jobs: SPLINEPY_GITHUB_ACTIONS_BUILD: True SKBUILD_INSTALL_COMPONENTS: PythonModule - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: wheels-windows-${{ strategy.job-index }} path: ./wheelhouse/*.whl @@ -109,32 +109,34 @@ jobs: source_dist: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: recursive - name: Build sdist run: pipx run build --sdist - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: wheels-source path: ./dist/* retention-days: 1 - # upload_pypi: - # needs: [macos_wheel, macos_wheel-m1, linux_wheel, windows_wheel, source_dist] - # runs-on: ubuntu-latest - # permissions: - # id-token: write - # steps: - # - uses: actions/download-artifact@v4 - # with: - # pattern: wheels-* - # merge-multiple: true - # path: dist - - # - uses: pypa/gh-action-pypi-publish@release/v1 - # with: - # skip-existing: true + upload_pypi: + needs: [macos_wheel, macos_wheel-m1, linux_wheel, windows_wheel, source_dist] + runs-on: ubuntu-latest + permissions: + id-token: write + steps: + - uses: actions/download-artifact@v7 + with: + pattern: wheels-* + merge-multiple: true + path: dist + + - name: Publish wheels to PyPI + if: github.ref == 'refs/heads/main' + uses: pypa/gh-action-pypi-publish@release/v1 + with: + skip-existing: true From b0d725fbd372ed0d8750aa813e500692bae2d2aa Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Wed, 24 Jun 2026 13:23:13 +0200 Subject: [PATCH 5/8] Chore: Remove linux cp14t build since it makes some issues for us. Might come back to that funi does not release cp14t --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24c3d2680..b55f04ddc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,6 +71,7 @@ jobs: env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.cw_build }} + CIBW_SKIP: "cp314t-*" SPLINEPY_GITHUB_ACTIONS_BUILD: True SKBUILD_INSTALL_COMPONENTS: PythonModule From ab5c79ce7d3b0e97fd765639fab12375490c4354 Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Wed, 24 Jun 2026 15:03:29 +0200 Subject: [PATCH 6/8] Chore: Streamline workflow --- .github/workflows/main.yml | 129 +++++++++++-------------------------- 1 file changed, 38 insertions(+), 91 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b55f04ddc..ff6bc4987 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,127 +5,74 @@ on: branches: ["main", "fix-build"] jobs: - macos_wheel: - runs-on: macos-15-intel + build_wheels: strategy: + fail-fast: false matrix: - arch: [x86_64] - cw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"] - - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - name: build wheels - uses: pypa/cibuildwheel@v4.1.0 - env: - CIBW_ARCHS: ${{ matrix.arch }} - CIBW_BUILD: ${{ matrix.cw_build }} - SPLINEPY_GITHUB_ACTIONS_BUILD: True - SKBUILD_INSTALL_COMPONENTS: PythonModule - - - uses: actions/upload-artifact@v7 - with: - name: wheels-macos-15-intel-${{ strategy.job-index }} - path: ./wheelhouse/*.whl - retention-days: 1 - - macos_wheel-m1: - runs-on: macos-latest - strategy: - matrix: - arch: [arm64] - cw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"] - - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - name: build wheels - uses: pypa/cibuildwheel@v4.1.0 - env: - CIBW_ARCHS: ${{ matrix.arch }} - CIBW_BUILD: ${{ matrix.cw_build }} - SPLINEPY_GITHUB_ACTIONS_BUILD: True - SKBUILD_INSTALL_COMPONENTS: PythonModule - - - uses: actions/upload-artifact@v7 - with: - name: wheels-macos-${{ strategy.job-index }} - path: ./wheelhouse/*.whl - retention-days: 1 - - linux_wheel: - runs-on: ubuntu-latest - strategy: - matrix: - arch: [x86_64] - cw_build: ["cp310*many*", "cp311*many*", "cp312*many*", "cp313*many*", "cp314*many*"] - + include: + # macOS Intel + - os: macos-15-intel + arch: x86_64 + build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"] + platform: macos + # macOS ARM (M1/M2) + - os: macos-latest + arch: arm64 + build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"] + platform: macos + # Linux + - os: ubuntu-latest + arch: x86_64 + build: ["cp310*many*", "cp311*many*", "cp312*many*", "cp313*many*", "cp314*many*"] + platform: linux + skip: "cp314t-*" + # Windows + - os: windows-latest + arch: AMD64 + build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"] + platform: windows + test_skip: "*-win_arm64" + + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v7 with: submodules: recursive - - name: build wheels - uses: pypa/cibuildwheel@v4.1.0 - env: - CIBW_ARCHS: ${{ matrix.arch }} - CIBW_BUILD: ${{ matrix.cw_build }} - CIBW_SKIP: "cp314t-*" - SPLINEPY_GITHUB_ACTIONS_BUILD: True - SKBUILD_INSTALL_COMPONENTS: PythonModule - - uses: actions/upload-artifact@v7 - with: - name: wheels-linux-${{ strategy.job-index }} - path: ./wheelhouse/*.whl - retention-days: 1 - - windows_wheel: - runs-on: windows-latest - strategy: - matrix: - arch: [AMD64] - cw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"] - - steps: - - uses: actions/checkout@v7 - with: - submodules: recursive - - name: build wheels + - name: Build wheels uses: pypa/cibuildwheel@v4.1.0 env: CIBW_ARCHS: ${{ matrix.arch }} - CIBW_BUILD: ${{ matrix.cw_build }} - CIBW_TEST_SKIP: "*-win_arm64" + CIBW_BUILD: ${{ matrix.build }} + CIBW_SKIP: ${{ matrix.skip || '' }} + CIBW_TEST_SKIP: ${{ matrix.test_skip || '' }} SPLINEPY_GITHUB_ACTIONS_BUILD: True SKBUILD_INSTALL_COMPONENTS: PythonModule - uses: actions/upload-artifact@v7 with: - name: wheels-windows-${{ strategy.job-index }} + name: wheels-${{ matrix.platform }}-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl - retention-days: 1 + retention-days: 7 - source_dist: + build_sdist: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 with: submodules: recursive - - name: Build sdist + - name: Build source distribution run: pipx run build --sdist - uses: actions/upload-artifact@v7 with: name: wheels-source path: ./dist/* - retention-days: 1 - + retention-days: 7 upload_pypi: - needs: [macos_wheel, macos_wheel-m1, linux_wheel, windows_wheel, source_dist] + needs: [build_wheels, build_sdist] runs-on: ubuntu-latest permissions: id-token: write @@ -136,7 +83,7 @@ jobs: merge-multiple: true path: dist - - name: Publish wheels to PyPI + - name: Publish to PyPI if: github.ref == 'refs/heads/main' uses: pypa/gh-action-pypi-publish@release/v1 with: From 3c850abd86b0685d7129991f4b8985f8c6999148 Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Wed, 24 Jun 2026 15:06:28 +0200 Subject: [PATCH 7/8] Chore: Streamline workflow, better --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff6bc4987..ccf6f7b28 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: uses: pypa/cibuildwheel@v4.1.0 env: CIBW_ARCHS: ${{ matrix.arch }} - CIBW_BUILD: ${{ matrix.build }} + CIBW_BUILD: ${{ join(matrix.build, ',') }} CIBW_SKIP: ${{ matrix.skip || '' }} CIBW_TEST_SKIP: ${{ matrix.test_skip || '' }} SPLINEPY_GITHUB_ACTIONS_BUILD: True From 356f7d8f0ebf79bb50ac5abe25a9c089735a5efd Mon Sep 17 00:00:00 2001 From: "clemens.fricke" Date: Wed, 24 Jun 2026 15:08:52 +0200 Subject: [PATCH 8/8] Chore: Streamline workflow, better --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccf6f7b28..a69117a55 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: uses: pypa/cibuildwheel@v4.1.0 env: CIBW_ARCHS: ${{ matrix.arch }} - CIBW_BUILD: ${{ join(matrix.build, ',') }} + CIBW_BUILD: ${{ join(matrix.build, ' ') }} CIBW_SKIP: ${{ matrix.skip || '' }} CIBW_TEST_SKIP: ${{ matrix.test_skip || '' }} SPLINEPY_GITHUB_ACTIONS_BUILD: True