From bb885f563004454242ab719bad14d4e4368631b9 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 8 Nov 2024 11:15:37 -0800 Subject: [PATCH 1/4] gz-sim7: use python 3.13 Signed-off-by: Steve Peters --- Formula/gz-sim7.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Formula/gz-sim7.rb b/Formula/gz-sim7.rb index e071a394f..c65422cf5 100644 --- a/Formula/gz-sim7.rb +++ b/Formula/gz-sim7.rb @@ -30,14 +30,14 @@ class GzSim7 < Formula depends_on macos: :mojave # c++17 depends_on "pkg-config" depends_on "protobuf" - depends_on "python@3.12" + depends_on "python@3.13" depends_on "qt@5" depends_on "ruby" depends_on "sdformat13" depends_on "tinyxml2" def python_cmake_arg - "-DPython3_EXECUTABLE=#{which("python3")}" + "-DPython3_EXECUTABLE=#{Formula["python@3.13"].opt_libexec}/bin/python}" end def install @@ -57,7 +57,7 @@ def install system "make", "install" end - (lib/"python3.12/site-packages").install Dir[lib/"python/*"] + (lib/"python3.13/site-packages").install Dir[lib/"python/*"] rmdir prefix/"lib/python" end @@ -148,6 +148,6 @@ def install cmd_not_grep_xcode = "! grep -rnI 'Applications[/]Xcode' #{prefix}" system cmd_not_grep_xcode # check python import - system Formula["python@3.12"].opt_libexec/"bin/python", "-c", "import gz.sim7" + system Formula["python@3.13"].opt_libexec/"bin/python", "-c", "import gz.sim7" end end From 8e76884ccae10bc736851b91de1dde1f5e252c61 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 8 Nov 2024 11:15:56 -0800 Subject: [PATCH 2/4] gz-sim7: revision bump --- Formula/gz-sim7.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/gz-sim7.rb b/Formula/gz-sim7.rb index c65422cf5..ed16dbfda 100644 --- a/Formula/gz-sim7.rb +++ b/Formula/gz-sim7.rb @@ -4,7 +4,7 @@ class GzSim7 < Formula url "https://osrf-distributions.s3.amazonaws.com/gz-sim/releases/gz-sim-7.9.0.tar.bz2" sha256 "b8a506112d1287efce144b5a1264ab5754cacc436370fe2f1035b35cdd0d29a4" license "Apache-2.0" - revision 6 + revision 7 head "https://github.com/gazebosim/gz-sim.git", branch: "gz-sim7" From 67a1aad41a886649add41b137f56be30f863f204 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 8 Nov 2024 11:16:02 -0800 Subject: [PATCH 3/4] gz-launch6: revision bump --- Formula/gz-launch6.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/gz-launch6.rb b/Formula/gz-launch6.rb index 3d59beda1..6ea6d7fd8 100644 --- a/Formula/gz-launch6.rb +++ b/Formula/gz-launch6.rb @@ -4,7 +4,7 @@ class GzLaunch6 < Formula url "https://osrf-distributions.s3.amazonaws.com/gz-launch/releases/gz-launch-6.1.0.tar.bz2" sha256 "7c789c85ffb422ebbc4adb6f93c9b2aa7fdd7eccd521b7895297a6b8c525acc1" license "Apache-2.0" - revision 33 + revision 34 head "https://github.com/gazebosim/gz-launch.git", branch: "gz-launch6" From 4f63a00ea0eaf8e6214350a95161d07eaa32c244 Mon Sep 17 00:00:00 2001 From: OSRF Build Bot Date: Fri, 8 Nov 2024 21:10:24 +0000 Subject: [PATCH 4/4] update bottle. --- Formula/gz-launch6.rb | 6 ++++++ Formula/gz-sim7.rb | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Formula/gz-launch6.rb b/Formula/gz-launch6.rb index 6ea6d7fd8..8fa30e452 100644 --- a/Formula/gz-launch6.rb +++ b/Formula/gz-launch6.rb @@ -8,6 +8,12 @@ class GzLaunch6 < Formula head "https://github.com/gazebosim/gz-launch.git", branch: "gz-launch6" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 sonoma: "49350400df3254d59ef321b220e14378a3a3bd42619b0e788ee52df773f9e267" + sha256 ventura: "21c7e35f6b240e5bd62281511245fe4da876a8c358a82b588b3743ebd84594fd" + end + depends_on "cmake" => :build depends_on "pkg-config" => :build diff --git a/Formula/gz-sim7.rb b/Formula/gz-sim7.rb index ed16dbfda..24b4330f2 100644 --- a/Formula/gz-sim7.rb +++ b/Formula/gz-sim7.rb @@ -8,6 +8,12 @@ class GzSim7 < Formula head "https://github.com/gazebosim/gz-sim.git", branch: "gz-sim7" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 sonoma: "99a76a7478f66f68dc328047af379dd545957d7426d588c7cdd788317478a408" + sha256 ventura: "154f23ac5d7f0c18dc7ca1f80add3bc683756421e41cfd79ac6116b80290bb25" + end + depends_on "cmake" => :build depends_on "pybind11" => :build depends_on "abseil"