From 15a26edc67784be29a7e2eae3d16527c69f4c927 Mon Sep 17 00:00:00 2001 From: Geoff deRosenroll Date: Mon, 13 Mar 2023 16:27:46 -0700 Subject: [PATCH 1/3] Update pybind11 to latest stable commit --- bindings/python/third_party/pybind11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/third_party/pybind11 b/bindings/python/third_party/pybind11 index ffa346860..12852cd33 160000 --- a/bindings/python/third_party/pybind11 +++ b/bindings/python/third_party/pybind11 @@ -1 +1 @@ -Subproject commit ffa346860b306c9bbfb341aed9c14c067751feb8 +Subproject commit 12852cd33bdaae0fe5fecc0db39b788dbbcc7b3d From 28f6394918baa3e1b25b8323f73ee0d7200c88e7 Mon Sep 17 00:00:00 2001 From: Geoff deRosenroll Date: Mon, 13 Mar 2023 16:47:10 -0700 Subject: [PATCH 2/3] Explicitly install python@3.11 in mac CI --- .github/workflows/manifold.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml index bd048f545..feb348aee 100644 --- a/.github/workflows/manifold.yml +++ b/.github/workflows/manifold.yml @@ -195,7 +195,7 @@ jobs: if: github.event.pull_request.draft == false steps: - name: Install common dependencies - run: brew install pkg-config + run: brew install pkg-config python@3.11 - name: Install OpenMP if: matrix.parallel_backend == 'OMP' run: brew install libomp From 4439d49376ab8283255739fd8cb3b90898f133cb Mon Sep 17 00:00:00 2001 From: Geoff deRosenroll Date: Mon, 13 Mar 2023 16:56:41 -0700 Subject: [PATCH 3/3] Turn findpython on --- .github/workflows/manifold.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml index feb348aee..2c4016fa1 100644 --- a/.github/workflows/manifold.yml +++ b/.github/workflows/manifold.yml @@ -211,7 +211,7 @@ jobs: git apply thrust.diff mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DMANIFOLD_DEBUG=ON -DMANIFOLD_PYBIND=ON -DMANIFOLD_PAR=${{matrix.parallel_backend}} .. && make + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DMANIFOLD_DEBUG=ON -DMANIFOLD_PYBIND=ON -DPYBIND11_FINDPYTHON=ON -DMANIFOLD_PAR=${{matrix.parallel_backend}} .. && make - name: Test run: | cd build/test