cmeel: update

cmake-wheel · Jan 3, 2025 · 183f3bc · 183f3bc
1 parent b3ce356
commit 183f3bc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,18 +15,30 @@ env:
 
 jobs:
   wheel:
-    name: "${{ matrix.build }} ${{ matrix.os }} ${{ matrix.arch }}"
+    name: "Wheel ${{ matrix.python }} ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.openmp }}"
     runs-on: "${{ matrix.os }}-latest"
     strategy:
       matrix:
         os: ["ubuntu", "macos"]
-        arch: ["x86_64", "aarch64"]
-        build: ["cp38", "cp39", "cp310", "cp311", "cp312"]
+        arch: ["x86_64", "aarch64", "arm64"]
+        python: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"]
+        openmp: ["ON", "OFF"]
         exclude:
+          - os: "macos"
+            arch: "x86_64"
           - os: "macos"
             arch: "aarch64"
           - os: "macos"
-            build: "cp38"
+            python: "cp38"
+          - os: "ubuntu"
+            arch: "arm64"
+          - arch: "aarch64"
+            openmp: "ON"
+          - arch: "arm64"
+            openmp: "ON"
+          - arch: "x86_64"
+            openmp: "OFF"
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -39,16 +51,16 @@ jobs:
       - run: pipx install cibuildwheel
       - run: cibuildwheel --output-dir wh
         env:
-          CIBW_BUILD: "${{ matrix.build }}-*"
+          CIBW_BUILD: "${{ matrix.python }}-*"
           CIBW_ARCHS: "${{ matrix.arch }}"
           CIBW_SKIP: "*-musllinux_aarch64"
           CIBW_MANYLINUX_X86_64_IMAGE: "quay.io/pypa/manylinux_2_28_x86_64"
           CIBW_MANYLINUX_AARCH64_IMAGE: "quay.io/pypa/manylinux_2_28_aarch64"
           CIBW_REPAIR_WHEEL_COMMAND: ""
-          CIBW_ENVIRONMENT: CMEEL_LOG_LEVEL="DEBUG" CMEEL_JOBS="1" CMEEL_TEST_JOBS="1" CMEEL_RUN_TESTS="false"
+          CIBW_ENVIRONMENT: CMEEL_LOG_LEVEL="DEBUG" CMEEL_JOBS="1" CMEEL_TEST_JOBS="1" CMEEL_RUN_TESTS="false" CMEEL_CMAKE_ARGS="-DBUILD_WITH_OPENMP_SUPPORT=${{ matrix.openmp }}"
       - uses: actions/upload-artifact@v4
         with:
-          name: "artifact-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.build }}"
+          name: "artifact-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.python }}"
           path: wh/pin*
 
   sdist:
@@ -59,11 +71,11 @@ jobs:
           submodules: 'true'
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
       - name: setup
         run: |
           python -m pip install -U pip
-          python -m pip install build cmeel[build] hpp-fcl[build] 'cmeel-urdfdom[build] < 4' scipy
+          python -m pip install build cmeel[build] coal-library[build] 'cmeel-urdfdom[build] < 4' scipy
       - name: build sdist
         run: python -m build -nso dist .
       - uses: actions/upload-artifact@v4

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,18 +1,18 @@
 [build-system]
 build-backend = "cmeel"
 requires = [
-  "cmeel-boost ~= 1.83.0",
+  "cmeel-boost ~= 1.87.0",
   "cmeel-urdfdom[build] >= 3.1.1.1, < 4",
   "cmeel[build]",
-  "hpp-fcl[build] >= 2.3.4, < 4",
+  "coal-library[build] >= 3, < 4",
   "scipy",
 ]
 
 [project]
 dependencies = [
-  "cmeel-boost ~= 1.83.0",
+  "cmeel-boost ~= 1.87.0",
   "cmeel-urdfdom >= 3.1.1.1, < 4",
-  "hpp-fcl >= 2.3.4, < 4"
+  "coal-library >= 3, < 4"
 ]
 description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"
 license = "BSD-3-Clause"