From 834ca14fed555396bb3ad7fb912b2deca962a25f Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:43:35 -0500 Subject: [PATCH 1/3] Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index acee87feb..9e7d6a157 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,4 +1,4 @@ -libgz-cmake3-dev +libgz-cmake4-dev libgz-math7-dev libgz-tools2-dev libgz-utils2-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d739ac42..7e234da46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,8 @@ set (BUILD_SDF ON CACHE INTERNAL "Build SDF" FORCE) ################################################# # Find gz-cmake -find_package(gz-cmake3 REQUIRED) -set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) +find_package(gz-cmake4 REQUIRED) +set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) ######################################## option(SKIP_PYBIND11 From 638ce2203b5961b98b5d72d6800c97656e42ef84 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:58:46 -0500 Subject: [PATCH 2/3] Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 4 ++-- CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 9e7d6a157..eacc20a3b 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,8 +1,8 @@ libgz-cmake4-dev libgz-math7-dev libgz-tools2-dev -libgz-utils2-dev -libgz-utils2-cli-dev +libgz-utils3-dev +libgz-utils3-cli-dev libtinyxml2-dev liburdfdom-dev libxml2-utils diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e234da46..9a3afe351 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,8 +118,8 @@ if (BUILD_SDF) ######################################## # Find gz utils - gz_find_package(gz-utils2 REQUIRED COMPONENTS cli) - set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR}) + gz_find_package(gz-utils3 REQUIRED COMPONENTS cli) + set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) ######################################## # Python interfaces From 399ffcb1f62848c9865fa29b5dac5bc6269dd422 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 18:07:43 -0500 Subject: [PATCH 3/3] Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 4 ++-- CMakeLists.txt | 4 ++-- python/test/gz_test_deps/README | 4 ++-- python/test/gz_test_deps/math.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index eacc20a3b..8aa64ba06 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,5 +1,5 @@ libgz-cmake4-dev -libgz-math7-dev +libgz-math8-dev libgz-tools2-dev libgz-utils3-dev libgz-utils3-cli-dev @@ -8,7 +8,7 @@ liburdfdom-dev libxml2-utils python3-dev python3-distutils -python3-gz-math7 +python3-gz-math8 python3-psutil python3-pybind11 python3-pytest diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a3afe351..cbd03e55d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,8 +113,8 @@ if (BUILD_SDF) ######################################## # Find gz math # Set a variable for generating ProjectConfig.cmake - gz_find_package(gz-math7 VERSION REQUIRED) - set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) + gz_find_package(gz-math8 VERSION REQUIRED) + set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR}) ######################################## # Find gz utils diff --git a/python/test/gz_test_deps/README b/python/test/gz_test_deps/README index 29f5c57e1..ea62f3a58 100644 --- a/python/test/gz_test_deps/README +++ b/python/test/gz_test_deps/README @@ -3,6 +3,6 @@ bindings such that the version number only has to be changed in this package. Here's an example of how to use this in a python test: ```python -from gz_test_deps import math # instead of from gz import math7 -from gz_test_deps.math import Vector3d # instead of from gz.math7 import Vector3d +from gz_test_deps import math # instead of from gz import math8 +from gz_test_deps.math import Vector3d # instead of from gz.math8 import Vector3d ``` diff --git a/python/test/gz_test_deps/math.py b/python/test/gz_test_deps/math.py index cb2860c79..d84d0a477 100644 --- a/python/test/gz_test_deps/math.py +++ b/python/test/gz_test_deps/math.py @@ -1 +1 @@ -from gz.math7 import * +from gz.math8 import *