Imported upstream version '1.0.4' of 'upstream'

ros2-gbp · Aug 29, 2024 · 81316e9 · 81316e9
1 parent 0119e20
commit 81316e9
Show file tree

Hide file tree

Showing 40 changed files with 95 additions and 1,402 deletions.
diff --git a/.github/workflows/ros2-ci.yml b/.github/workflows/ros2-ci.yml
@@ -12,7 +12,7 @@ jobs:
         include:
           - docker-image: "ubuntu:24.04"
             gz-version: "harmonic"
-            ros-distro: "rolling"
+            ros-distro: "jazzy"
     container:
       image: ${{ matrix.docker-image }}
     steps:

diff --git a/ros_gz/CHANGELOG.rst b/ros_gz/CHANGELOG.rst
@@ -2,13 +2,13 @@
 Changelog for package ros_gz
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.0.1 (2024-08-29)
+1.0.4 (2024-08-29)
 ------------------
 
-2.0.0 (2024-07-22)
+1.0.3 (2024-07-22)
 ------------------
 
-1.0.1 (2024-07-03)
+1.0.2 (2024-07-03)
 ------------------
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
 * 0.244.14

diff --git a/ros_gz/package.xml b/ros_gz/package.xml
@@ -4,7 +4,7 @@
   <!-- TODO: Make this a metapackage, see
        https://github.com/ros2/ros2/issues/408 -->
   <name>ros_gz</name>
-  <version>2.0.1</version>
+  <version>1.0.4</version>
   <description>Meta-package containing interfaces for using ROS 2 with <a href="https://gazebosim.org">Gazebo</a> simulation.</description>
   <maintainer email="[email protected]">Aditya Pande</maintainer>
   <maintainer email="[email protected]">Alejandro Hernandez</maintainer>

diff --git a/ros_gz_bridge/CHANGELOG.rst b/ros_gz_bridge/CHANGELOG.rst
@@ -2,27 +2,27 @@
 Changelog for package ros_gz_bridge
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.0.1 (2024-08-29)
+1.0.4 (2024-08-29)
 ------------------
-* Stamp all outgoing headers with the wall time if parameter override_timestamps_with_wall_time is set to true (`#562 <https://github.com/gazebosim/ros_gz/issues/562>`_)
-* Contributors: Rein Appeldoorn
+* feat: `override_timestamps_with_wall_time` parameter (backport `#562 <https://github.com/gazebosim/ros_gz/issues/562>`_) (`#584 <https://github.com/gazebosim/ros_gz/issues/584>`_)
+  Co-authored-by: Rein Appeldoorn <[email protected]>
+* Use memcpy instead of std::copy when bridging images (`#565 <https://github.com/gazebosim/ros_gz/issues/565>`_) (`#585 <https://github.com/gazebosim/ros_gz/issues/585>`_)
+  While testing ros <-> gz communication using the bridge I noticed that the bridge was talking quite a bit of time copying images from Gazebo to ROS. I found that the std::copy operation that we're doing is substantially slower than the memcpy alternative. I think that in principle this shouldn't happen but the numbers are quite clear. Perhaps std::copy is doing something that doesn't use cache effectively
+  ---------
+  Co-authored-by: Jose Luis Rivero <[email protected]>
+  (cherry picked from commit a781b78852112246245c05481db6335388d4f736)
+  Co-authored-by: Carlos Agüero <[email protected]>
+* Contributors: mergify[bot]
 
-2.0.0 (2024-07-22)
+1.0.3 (2024-07-22)
 ------------------
-* Making use_composition true by default (`#578 <https://github.com/gazebosim/ros_gz/issues/578>`_)
-* Contributors: Addisu Z. Taddese
+* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz/issues/573>`_) (`#574 <https://github.com/gazebosim/ros_gz/issues/574>`_)
+  (cherry picked from commit f9afb69d1163633dd978024bb7271a28cf7b551a)
+  Co-authored-by: Victor T. Noppeney <[email protected]>
+* Contributors: mergify[bot]
 
-1.0.1 (2024-07-03)
+1.0.2 (2024-07-03)
 ------------------
-* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz//issues/573>`_)
-* Merge pull request `#571 <https://github.com/gazebosim/ros_gz//issues/571>`_ from azeey/jazzy_to_ros2
-  Merge jazzy ➡️  ros2
-* Merge branch 'ros2' into jazzy_to_ros2
-* Use memcpy instead of std::copy when bridging images (`#565 <https://github.com/gazebosim/ros_gz//issues/565>`_)
-  While testing ros <-> gz communication using the bridge I noticed that the bridge was talking quite a bit of time copying images from Gazebo to ROS. I found that the std::copy operation that we're doing is substantially slower than the memcpy alternative. I think that in principle this shouldn't happen but the numbers are quite clear. Perhaps std::copy is doing something that doesn't use cache effectively
-  ---------
-  Co-authored-by: Jose Luis Rivero <[email protected]>
-* Merge jazzy into ros2
 * Merge pull request `#569 <https://github.com/gazebosim/ros_gz//issues/569>`_ from azeey/iron_to_jazzy
   Merge iron ➡️  jazzy
 * Merge iron into jazzy
@@ -35,22 +35,6 @@ Changelog for package ros_gz_bridge
 * Merge pull request `#564 <https://github.com/gazebosim/ros_gz//issues/564>`_ from azeey/humble_to_iron
   Humble ➡️ Iron
 * Merge humble -> iron
-* Use `ignoreLocalMessages` in the bridge (`#559 <https://github.com/gazebosim/ros_gz//issues/559>`_)
-  * Ignore local messages
-* Update launch files with name parameter (`#556 <https://github.com/gazebosim/ros_gz//issues/556>`_)
-  * Name is required.
-* Ensure the same container is used for the bridge and gz_server (`#553 <https://github.com/gazebosim/ros_gz//issues/553>`_)
-  This also adds a required `name` parameter for the bridge so that
-  multiple different bridges can be created without name collision
-* Launch ros_gz_bridge from xml (`#550 <https://github.com/gazebosim/ros_gz//issues/550>`_)
-  * Add gzserver with ability to load an SDF file or string
-* Launch gzserver and the bridge as composable nodes (`#528 <https://github.com/gazebosim/ros_gz//issues/528>`_)
-  * Add gzserver with ability to load an SDF file or string
-* Add option to change material color from ROS. (`#521 <https://github.com/gazebosim/ros_gz//issues/521>`_)
-  Forward port of `#486 <https://github.com/gazebosim/ros_gz//issues/486>`_.
-  * Message and bridge for MaterialColor.
-  This allows bridging MaterialColor from ROS to GZ and is
-  important for allowing simulation users to create status lights.
 * populate imu covariances when converting (`#375 <https://github.com/gazebosim/ros_gz//issues/375>`_) (`#540 <https://github.com/gazebosim/ros_gz//issues/540>`_)
   Co-authored-by: El Jawad Alaa <[email protected]>
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
@@ -140,7 +124,7 @@ Changelog for package ros_gz_bridge
   * Update CMakeLists and package.xml for garden
   * Complete garden gz renaming
   * Drop fortress CI
-* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Arjun K Haridas, Benjamin Perseghetti, Carlos Agüero, El Jawad Alaa, Jose Luis Rivero, Krzysztof Wojciechowski, Michael Carroll, Rousseau Vincent, Victor T. Noppeney, Yadu, ahcorde, wittenator, ymd-stella
+* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Arjun K Haridas, Benjamin Perseghetti, El Jawad Alaa, Jose Luis Rivero, Krzysztof Wojciechowski, Michael Carroll, Rousseau Vincent, Yadu, ahcorde, wittenator, ymd-stella
 
 1.0.0 (2024-04-24)
 ------------------

diff --git a/ros_gz_bridge/CMakeLists.txt b/ros_gz_bridge/CMakeLists.txt
@@ -22,9 +22,6 @@ find_package(gz-transport REQUIRED)
 find_package(gz_msgs_vendor REQUIRED)
 find_package(gz-msgs REQUIRED)
 
-# Install the python module for this package
-ament_python_install_package(${PROJECT_NAME})
-
 set(GZ_MSGS_VERSION_FULL ${gz-msgs_VERSION})
 
 set(BRIDGE_MESSAGE_TYPES
@@ -136,11 +133,6 @@ install(
   DESTINATION include/${PROJECT_NAME}
 )
 
-install(
-  DIRECTORY launch/
-  DESTINATION share/${PROJECT_NAME}/launch
-)
-
 set(bridge_executables
   parameter_bridge
   static_bridge

diff --git a/ros_gz_bridge/launch/ros_gz_bridge.launch b/ros_gz_bridge/launch/ros_gz_bridge.launch
diff --git a/ros_gz_bridge/launch/ros_gz_bridge.launch.py b/ros_gz_bridge/launch/ros_gz_bridge.launch.py
diff --git a/ros_gz_bridge/package.xml b/ros_gz_bridge/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ros_gz_bridge</name>
-  <version>2.0.1</version>
+  <version>1.0.4</version>
   <description>Bridge communication between ROS and Gazebo Transport</description>
   <maintainer email="[email protected]">Aditya Pande</maintainer>
   <maintainer email="[email protected]">Alejandro Hernandez</maintainer>
@@ -11,18 +11,14 @@
 
   <author>Shivesh Khaitan</author>
   <author>Louise Poubel</author>
-  <author email="[email protected]">Carlos Agüero</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <buildtool_depend>ament_cmake_python</buildtool_depend>
   <buildtool_depend>pkg-config</buildtool_depend>
   <buildtool_depend>rosidl_pycommon</buildtool_depend>
 
   <depend>actuator_msgs</depend>
   <depend>geometry_msgs</depend>
   <depend>gps_msgs</depend>
-  <depend>launch</depend>
-  <depend>launch_ros</depend>
   <depend>nav_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/ros_gz_bridge/resource/ros_gz_bridge b/ros_gz_bridge/resource/ros_gz_bridge
diff --git a/ros_gz_bridge/ros_gz_bridge/__init__.py b/ros_gz_bridge/ros_gz_bridge/__init__.py
@@ -20,12 +20,6 @@
 
 from rosidl_pycommon import expand_template
 
-from . import actions
-
-__all__ = [
-    'actions',
-]
-
 
 @dataclass
 class MessageMapping:

diff --git a/ros_gz_bridge/ros_gz_bridge/actions/__init__.py b/ros_gz_bridge/ros_gz_bridge/actions/__init__.py