diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 89e0b21c..03c5737f 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@v3.3.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: name: cibw-wheels-${{ matrix.os }} path: wheelhouse/*.whl - \ No newline at end of file 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. """ diff --git a/pyproject.toml b/pyproject.toml index 7761974a..37a22d00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,5 +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 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*"]