From c83bf95f95e9a57bb6dceb075c82845d3f4d9753 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 09:06:29 +0100 Subject: [PATCH 01/17] Update wheels.yml: sdist draft --- .github/workflows/wheels.yml | 46 +++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4a24d3f..4c7411d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -5,22 +5,11 @@ on: workflow_dispatch jobs: ###################### - # Job: Build wheel + # Job: Build sdist ###################### - build-wheels: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - #os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest - #os: [macos-15-intel, macos-latest, ubuntu-latest] # 12 oldest - os: [ubuntu-latest] - - + build-sdist: + runs-on: ubuntu-latest steps: - - ## Used to host cibuildwheel - # - uses: actions/setup-python@v5 - name: Checkout self uses: actions/checkout@v4 @@ -40,7 +29,36 @@ jobs: - name: Switch to Pybind feature branch(es), if any. run: python3 ughub/ughub.py git checkout feature-pybind11 continue-on-error: true + + - name: Install Python + run: | + pip3 install build + python3 -m build --sdist + + - uses: actions/upload-artifact@v4 + with: + name: sdist + path: dist/*.tar.gz + + ###################### + # Job: Build wheel + ###################### + build-wheels: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + #os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest + #os: [macos-15-intel, macos-latest, ubuntu-latest] # 12 oldest + os: [ubuntu-latest] + + + steps: + + ## Used to host cibuildwheel + # - uses: actions/setup-python@v5 + # We would need MPI in CIBW - no here... # - name: Checkout MPI. # uses: mpi4py/setup-mpi@v1 From 0d29ba10bbc4335600e6f17569c474a841ab6f28 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 09:08:26 +0100 Subject: [PATCH 02/17] Update wheels.yml --- .github/workflows/wheels.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4c7411d..73585a9 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -58,7 +58,14 @@ jobs: ## Used to host cibuildwheel # - uses: actions/setup-python@v5 - + - name: Checkout self + uses: actions/checkout@v4 + - name: Download sdist. + uses: actions/download-artifact@v4 + with: + name: sdist + path: dist + # We would need MPI in CIBW - no here... # - name: Checkout MPI. # uses: mpi4py/setup-mpi@v1 From baa12e5cc21d246113435c560f52ef8cf10be359 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 09:14:19 +0100 Subject: [PATCH 03/17] Update wheels.yml: Dependency --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 73585a9..973631d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -45,6 +45,7 @@ jobs: # Job: Build wheel ###################### build-wheels: + needs: build-sdist name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: From 07e26767027f076902568122a13d495219b9d009 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 09:26:45 +0100 Subject: [PATCH 04/17] Update wheels.yml: dist dir --- .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 973631d..463e769 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -92,7 +92,7 @@ jobs: # CIBW_ENVIRONMENT_PASS_LINUX: CFLAGS CXXFLAGS with: - package-dir: . + package-dir: dist output-dir: wheelhouse # config-file: "pyproject.toml" config-file: "{package}/pyproject.toml" From 745bf9ea1f16323b8dcd4a5d4be9a7f7304521bc Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 09:36:30 +0100 Subject: [PATCH 05/17] Update wheels.yml: package-dir: dist/ug4py_base-0.2.3.tar.gz --- .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 463e769..ee3ad65 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -92,7 +92,7 @@ jobs: # CIBW_ENVIRONMENT_PASS_LINUX: CFLAGS CXXFLAGS with: - package-dir: dist + package-dir: dist/ug4py_base-0.2.3.tar.gz output-dir: wheelhouse # config-file: "pyproject.toml" config-file: "{package}/pyproject.toml" From b273223d11f45c6cd333f47c4ed7a4a2c33729a1 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 09:46:12 +0100 Subject: [PATCH 06/17] Update pyproject.toml: include cpp --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 26b442b..c380705 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,3 +27,8 @@ cmake.version = ">=3.15" cmake.args=['-DCMAKE_POLICY_VERSION_MINIMUM=3.5', '-DCMAKE_POSITION_INDEPENDENT_CODE=ON', '-DTARGET=libug4','-DPARALLEL:BOOL=OFF','-DUSE_PYBIND11:BOOL=ON', '-DSTATIC_BUILD:BOOL=ON', '-DDIM="1;2;3"', '-DCPU=1','-DConvectionDiffusion:BOOL=ON', '-DLimex:BOOL=ON', '-DUtil:BOOL=ON'] logging.level = "DEBUG" + +# Explicitly include all cpp +sdist.include = [ + "**/*.cpp" +] From 7f2711664e67d31fe2699502ad3d56f39e9d35b1 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 10:44:48 +0100 Subject: [PATCH 07/17] Update wheels.yml: add sdist to package --- .github/workflows/wheels.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ee3ad65..01e8f26 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout self - uses: actions/checkout@v4 + uses: actions/checkout@v8 - name: Checkout ughub run: | @@ -35,7 +35,7 @@ jobs: pip3 install build python3 -m build --sdist - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v8 with: name: sdist path: dist/*.tar.gz @@ -52,7 +52,7 @@ jobs: matrix: #os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest #os: [macos-15-intel, macos-latest, ubuntu-latest] # 12 oldest - os: [ubuntu-latest] + os: [] steps: @@ -60,9 +60,9 @@ jobs: ## Used to host cibuildwheel # - uses: actions/setup-python@v5 - name: Checkout self - uses: actions/checkout@v4 + uses: actions/checkout@v8 - name: Download sdist. - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: sdist path: dist @@ -97,7 +97,7 @@ jobs: # config-file: "pyproject.toml" config-file: "{package}/pyproject.toml" - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v8 with: name: ug4py-basic-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl @@ -118,8 +118,14 @@ jobs: id-token: write steps: # retrieve your distributions here - - name: Download all wheels - uses: actions/download-artifact@v4 + - name: Download sdist. + uses: actions/download-artifact@v8 + with: + name: sdist + path: dist/ + + - name: Download wheels. + uses: actions/download-artifact@v8 with: pattern: ug4py-basic-wheels-* merge-multiple: true From be0d62508d83bf98829ef5f6f3b3526959863b3d Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 10:46:48 +0100 Subject: [PATCH 08/17] Update wheels.yml: Ubuntu only --- .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 01e8f26..12bc0d6 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -52,7 +52,7 @@ jobs: matrix: #os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest #os: [macos-15-intel, macos-latest, ubuntu-latest] # 12 oldest - os: [] + os: [ubuntu] steps: From 3761c3e8a91f52ddae4679a1d74daa12e972011d Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 10:47:22 +0100 Subject: [PATCH 09/17] Update pyproject.toml: v0.3.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c380705..0debb39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ build-backend = "scikit_build_core.build" [project] name = "ug4py-base" -version = "0.2.3" +version = "0.3.0" description = "This is a basic python package for UG4." readme = {file = "README.md", content-type = "text/markdown"} From b827af88d6d4dfdf076a1381aa8c71c6e8aaccf4 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 10:48:00 +0100 Subject: [PATCH 10/17] Update wheels.yml: cp312 --- .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 12bc0d6..595f98f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -76,8 +76,8 @@ jobs: env: CIBW_BUILD_VERBOSITY: 1 # CIBW_REPAIR_WHEEL_COMMAND: '' - # CIBW_BUILD: cp311-* - CIBW_BUILD: cp312-* cp314-* + CIBW_BUILD: cp312-* + # CIBW_BUILD: cp312-* cp314-* # Skip builds for 32-bit builds and some others... CIBW_SKIP: "*-win32 *-musllinux_* *linux_i686 *linux_s390x *linux_aarch64 *linux_s390x" From 3793b2591964fe493d7668ba8e1edd70987962e2 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 10:49:40 +0100 Subject: [PATCH 11/17] Update wheels.yml:actions/upload-artifact@v4 --- .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 595f98f..975083c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -35,7 +35,7 @@ jobs: pip3 install build python3 -m build --sdist - - uses: actions/upload-artifact@v8 + - uses: actions/upload-artifact@v4 with: name: sdist path: dist/*.tar.gz @@ -97,7 +97,7 @@ jobs: # config-file: "pyproject.toml" config-file: "{package}/pyproject.toml" - - uses: actions/upload-artifact@v8 + - uses: actions/upload-artifact@v4 with: name: ug4py-basic-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl From 966c8f20638d12a046b6f4a30eeb90ea59f82070 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 10:51:06 +0100 Subject: [PATCH 12/17] Update wheels.yml:actions/checkout@v6 --- .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 975083c..0a5dccc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout self - uses: actions/checkout@v8 + uses: actions/checkout@v6 - name: Checkout ughub run: | @@ -60,7 +60,7 @@ jobs: ## Used to host cibuildwheel # - uses: actions/setup-python@v5 - name: Checkout self - uses: actions/checkout@v8 + uses: actions/checkout@v6 - name: Download sdist. uses: actions/download-artifact@v8 with: From 1fa454341bac0d1fc896c04d09275d6401011bfb Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 11:14:31 +0100 Subject: [PATCH 13/17] Update wheels.yml: ubuntu-latest --- .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 0a5dccc..1b0d933 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -52,7 +52,7 @@ jobs: matrix: #os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest #os: [macos-15-intel, macos-latest, ubuntu-latest] # 12 oldest - os: [ubuntu] + os: [ubuntu-latest] steps: From 5b8f76d083c2438f229ed532f458355e2af02df3 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 11:19:12 +0100 Subject: [PATCH 14/17] Update wheels.yml:0.3.0 --- .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 1b0d933..cc81a2d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -92,7 +92,7 @@ jobs: # CIBW_ENVIRONMENT_PASS_LINUX: CFLAGS CXXFLAGS with: - package-dir: dist/ug4py_base-0.2.3.tar.gz + package-dir: dist/ug4py_base-0.3.0.tar.gz output-dir: wheelhouse # config-file: "pyproject.toml" config-file: "{package}/pyproject.toml" From 67728ad7d52663448b0903f00418ff830ac8561b Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 12:00:54 +0100 Subject: [PATCH 15/17] Update wheels.yml: MacOS, Windows --- .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 cc81a2d..4bc3235 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -51,8 +51,8 @@ jobs: strategy: matrix: #os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest - #os: [macos-15-intel, macos-latest, ubuntu-latest] # 12 oldest - os: [ubuntu-latest] + os: [macos-15-intel, macos-latest, windows-latest] # 12 oldest + #os: [ubuntu-latest] steps: From 6c024c3cb30a3876a6abaf7bcb5dcbf470d03272 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 13:04:11 +0100 Subject: [PATCH 16/17] Update wheels.yml: All OS --- .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 4bc3235..aec41ed 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -50,8 +50,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - #os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest - os: [macos-15-intel, macos-latest, windows-latest] # 12 oldest + os: [macos-15-intel, macos-latest, ubuntu-latest, windows-latest] # 12 oldest + #os: [macos-15-intel, macos-latest, windows-latest] # 12 oldest #os: [ubuntu-latest] From 1d2431056f5f597c47e8c613906e1ff200ae0be5 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 13 Mar 2026 13:04:52 +0100 Subject: [PATCH 17/17] Update wheels.yml: cp314 --- .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 aec41ed..83f492c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -76,7 +76,7 @@ jobs: env: CIBW_BUILD_VERBOSITY: 1 # CIBW_REPAIR_WHEEL_COMMAND: '' - CIBW_BUILD: cp312-* + CIBW_BUILD: cp314-* # CIBW_BUILD: cp312-* cp314-* # Skip builds for 32-bit builds and some others... CIBW_SKIP: "*-win32 *-musllinux_* *linux_i686 *linux_s390x *linux_aarch64 *linux_s390x"