From edd0105205cb946b7ffb280e4e23d858aa678440 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 22 Jan 2024 16:07:28 -0800 Subject: [PATCH 1/4] gz-math6: explicitly use python@3.11, add test Signed-off-by: Steve Peters --- Formula/ignition-math6.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Formula/ignition-math6.rb b/Formula/ignition-math6.rb index 19fa3b875..b3f0cc572 100644 --- a/Formula/ignition-math6.rb +++ b/Formula/ignition-math6.rb @@ -25,12 +25,16 @@ def install cmake_args = std_cmake_args cmake_args << "-DBUILD_TESTING=OFF" cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" + cmake_args << "-DPython3_EXECUTABLE=#{which("python3")}" # Use build folder mkdir "build" do system "cmake", "..", *cmake_args system "make", "install" end + + (lib/"python3.11/site-packages").install Dir[lib/"python/*"] + rmdir prefix/"lib/python" end test do @@ -67,5 +71,7 @@ def install # check for Xcode frameworks in bottle cmd_not_grep_xcode = "! grep -rnI 'Applications[/]Xcode' #{prefix}" system cmd_not_grep_xcode + # check python import + system Formula["python@3.11"].opt_bin/"python3.11", "-c", "import ignition.math" end end From c367a350c0fa251af046c954aaa807a5e8f66886 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 22 Jan 2024 16:08:10 -0800 Subject: [PATCH 2/4] gz-sim6: explicitly use python@3.11, add test Signed-off-by: Steve Peters --- Formula/ignition-gazebo6.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Formula/ignition-gazebo6.rb b/Formula/ignition-gazebo6.rb index 7366a914e..2b2c17e20 100644 --- a/Formula/ignition-gazebo6.rb +++ b/Formula/ignition-gazebo6.rb @@ -44,11 +44,15 @@ def install cmake_args = std_cmake_args cmake_args << "-DBUILD_TESTING=OFF" cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpaths.join(";")}" + cmake_args << "-DPython3_EXECUTABLE=#{which("python3")}" mkdir "build" do system "cmake", "..", *cmake_args system "make", "install" end + + (lib/"python3.11/site-packages").install Dir[lib/"python/*"] + rmdir prefix/"lib/python" end test do @@ -134,5 +138,7 @@ def install # check for Xcode frameworks in bottle cmd_not_grep_xcode = "! grep -rnI 'Applications[/]Xcode' #{prefix}" system cmd_not_grep_xcode + # check python import + system Formula["python@3.11"].opt_bin/"python3.11", "-c", "import ignition.gazebo" end end From 6e0fe04979163ec6255b866d214b830e46bd5084 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 22 Jan 2024 16:08:44 -0800 Subject: [PATCH 3/4] ignition-math6: revision bump for python --- Formula/ignition-math6.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/ignition-math6.rb b/Formula/ignition-math6.rb index b3f0cc572..4a9ab8337 100644 --- a/Formula/ignition-math6.rb +++ b/Formula/ignition-math6.rb @@ -4,6 +4,7 @@ class IgnitionMath6 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-math/releases/ignition-math6-6.15.1.tar.bz2" sha256 "a9e96a4e28d7d92d4d054cdae7cef28f1d8397b72433398bfc68855956531170" license "Apache-2.0" + revision 1 head "https://github.com/gazebosim/gz-math.git", branch: "ign-math6" From c1b518954a0ba7958c10a2a14327d0926b123883 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 22 Jan 2024 16:08:52 -0800 Subject: [PATCH 4/4] ignition-gazebo6: revision bump for python --- Formula/ignition-gazebo6.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-gazebo6.rb b/Formula/ignition-gazebo6.rb index 2b2c17e20..6366cc0b6 100644 --- a/Formula/ignition-gazebo6.rb +++ b/Formula/ignition-gazebo6.rb @@ -4,7 +4,7 @@ class IgnitionGazebo6 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-gazebo/releases/ignition-gazebo6-6.16.0.tar.bz2" sha256 "1e61148e8b49a5a20f4cac1e116ce5c4d8de3718a1d26e41a1cec394ce5ea9e4" license "Apache-2.0" - revision 1 + revision 2 head "https://github.com/gazebosim/gz-sim.git", branch: "ign-gazebo6"