From f83b1494b7bf015ed2ed1f8f510205a1ca40a8c4 Mon Sep 17 00:00:00 2001 From: Lauri Niemi Date: Fri, 12 Dec 2025 09:45:24 +0200 Subject: [PATCH 1/7] Require muparser 2.3.5 in conanfile. Older versions want to use outdated cmake --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 517a74bc..b2560b47 100644 --- a/conanfile.py +++ b/conanfile.py @@ -12,8 +12,8 @@ def requirements(self): self.requires("gsl/2.7.1") self.requires("hdf5/1.14.3") self.requires("pybind11/2.11.1") - self.requires("muparser/2.3.4") - + self.requires("muparser/2.3.5") + """Require llvm-openmp recipe if env variable is set. This version of OMP doesn't seem to work universally with our lib, so keep the option to use hidden. """ From 91e65695204bd5334e7520579eca2b84b3e446f8 Mon Sep 17 00:00:00 2001 From: Lauri Niemi Date: Fri, 12 Dec 2025 10:03:36 +0200 Subject: [PATCH 2/7] Stop building PyPy wheels. Not worth the hassle --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7761974a..6ea1cfc1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,5 +74,7 @@ macos.environment = {WALLGO_USE_CONAN_OMP="1", MACOSX_DEPLOYMENT_TARGET="11.0"} linux.archs = ["auto64"] macos.archs = ["auto"] windows.archs = ["auto64"] -# skip musllinux because the gsl recipe from conan failed to compile on them +# Skip musllinux because the gsl recipe from conan failed to compile on them skip = "*musllinux_*" +# Skip PyPy wheels on all platforms. Too much hassle with C-extensions and no demand +skip = "pp*" From 0e869547d0760834ad15c29ba6a47178c0cba9c1 Mon Sep 17 00:00:00 2001 From: Lauri Niemi Date: Fri, 12 Dec 2025 10:16:51 +0200 Subject: [PATCH 3/7] Fixed syntax --- pyproject.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6ea1cfc1..37a22d00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,7 +74,6 @@ macos.environment = {WALLGO_USE_CONAN_OMP="1", MACOSX_DEPLOYMENT_TARGET="11.0"} linux.archs = ["auto64"] macos.archs = ["auto"] windows.archs = ["auto64"] -# Skip musllinux because the gsl recipe from conan failed to compile on them -skip = "*musllinux_*" -# Skip PyPy wheels on all platforms. Too much hassle with C-extensions and no demand -skip = "pp*" +# Skip musllinux because the gsl recipe from conan failed to compile on them. +# Skip PyPy wheels on all platforms. Too much hassle with C-extensions and no demand. +skip = ["*musllinux_*", "pp*"] From c8445e401ba7f4e920b0f68fc277f7dbfec7b366 Mon Sep 17 00:00:00 2001 From: Lauri Niemi Date: Fri, 12 Dec 2025 10:47:33 +0200 Subject: [PATCH 4/7] Use latest version of cibuildwheel when building wheels --- .github/workflows/wheels.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 89e0b21c..e11e6c25 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -22,7 +22,7 @@ jobs: os: [ ubuntu-latest, windows-latest, - #macos-13, + macos-15-intel, macos-14 ] @@ -32,7 +32,7 @@ jobs: with: # Fetch everything to ensure we get tags fetch-depth: 0 - + # Install Conan here already because we want to cache/restore its installed dependencies. # TODO: Caching requires more work on linux wheels since those happen inside Docker environment - name: Install Conan @@ -58,13 +58,12 @@ jobs: - if: ${{ steps.cache-conan.outputs.cache-hit != 'true' }} name: Create default Conan profile if no cache was hit run: conan profile detect --exist-ok - + - name: Build and test wheels (cibuildwheel) - uses: pypa/cibuildwheel@v2.21.3 + uses: pypa/cibuildwheel - name: Upload wheels uses: actions/upload-artifact@v4 with: name: cibw-wheels-${{ matrix.os }} path: wheelhouse/*.whl - \ No newline at end of file From 6ffb4bfc019ce2ff4168ed7bb7741ce903b56f64 Mon Sep 17 00:00:00 2001 From: Lauri Niemi Date: Fri, 12 Dec 2025 10:49:35 +0200 Subject: [PATCH 5/7] Fix and update cibuildwheels version --- .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 e11e6c25..70c043e4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -60,7 +60,7 @@ jobs: run: conan profile detect --exist-ok - name: Build and test wheels (cibuildwheel) - uses: pypa/cibuildwheel + uses: pypa/cibuildwheel@3.3.0 - name: Upload wheels uses: actions/upload-artifact@v4 From d78c1792fde95d0d3c7a1b12cc713bd2fab4752d Mon Sep 17 00:00:00 2001 From: Lauri Niemi Date: Fri, 12 Dec 2025 10:57:17 +0200 Subject: [PATCH 6/7] Fix version syntax --- .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 70c043e4..40c7f77a 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -60,7 +60,7 @@ jobs: run: conan profile detect --exist-ok - name: Build and test wheels (cibuildwheel) - uses: pypa/cibuildwheel@3.3.0 + uses: pypa/cibuildwheel@v3.3.0 - name: Upload wheels uses: actions/upload-artifact@v4 From c67be7dc43d0aa432e6c46cb66b8bba1f2882b63 Mon Sep 17 00:00:00 2001 From: Lauri Niemi Date: Fri, 12 Dec 2025 11:53:20 +0200 Subject: [PATCH 7/7] Disable macos x86 wheel build again, arch detection still doesn't work without further work --- .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 40c7f77a..03c5737f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -22,7 +22,7 @@ jobs: os: [ ubuntu-latest, windows-latest, - macos-15-intel, + #macos-15-intel, macos-14 ]