From 3fd2fab0f6f9e74f79b1293ccb26e93ec4905af8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 15:43:38 -0700 Subject: [PATCH 01/23] XMLRPC server accepts request from all local IP addresses. (#729) (#733) Signed-off-by: Tomoya Fujita (cherry picked from commit c7d3204aad16b6d9f10d2b2dd26a04d5d88f6b23) Co-authored-by: Tomoya Fujita --- ros2cli/ros2cli/xmlrpc/local_server.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ros2cli/ros2cli/xmlrpc/local_server.py b/ros2cli/ros2cli/xmlrpc/local_server.py index fa384eed6..e946275ae 100644 --- a/ros2cli/ros2cli/xmlrpc/local_server.py +++ b/ros2cli/ros2cli/xmlrpc/local_server.py @@ -18,6 +18,19 @@ from xmlrpc.server import SimpleXMLRPCRequestHandler # noqa from xmlrpc.server import SimpleXMLRPCServer +import netifaces + + +def get_local_ipaddrs(): + iplist = [] + interfaces = netifaces.interfaces() + for interface in interfaces: + addrs = netifaces.ifaddresses(interface) + if netifaces.AF_INET in addrs.keys(): + for value in addrs[netifaces.AF_INET]: + iplist.append(value['addr']) + return iplist + class LocalXMLRPCServer(SimpleXMLRPCServer): @@ -37,6 +50,6 @@ def get_request(self): return sock, addr def verify_request(self, request, client_address): - if client_address[0] != '127.0.0.1': + if client_address[0] not in get_local_ipaddrs(): return False return super(LocalXMLRPCServer, self).verify_request(request, client_address) From 0bef9e0a36a33a62026af8ec9e671ee860c1272a Mon Sep 17 00:00:00 2001 From: Esteve Fernandez Date: Wed, 7 Sep 2022 19:47:27 +0200 Subject: [PATCH 02/23] [humble] Backport. Expand auto to the current time when passed to a Header field (#751) * Expand auto to the current time when passed to a Header field Signed-off-by: Esteve Fernandez * Make sure that the stamp field is updated every time the message is published Signed-off-by: Esteve Fernandez * Added support for passing 'now' as a value to a 'builtin_interfaces.msg.Time'. Added comments and expand docstring Signed-off-by: Esteve Fernandez * Only update timestamp fields that have been passed 'now' as a value Signed-off-by: Esteve Fernandez * Fix lint errors Signed-off-by: Esteve Fernandez * Added tests Signed-off-by: Esteve Fernandez * Remove node argument from set_message_fields_expanded Signed-off-by: Esteve Fernandez * Fix flake8 errors Signed-off-by: Esteve Fernandez Signed-off-by: Esteve Fernandez --- ros2topic/ros2topic/verb/pub.py | 94 ++++++++++++++++++++- ros2topic/test/test_pub.py | 144 ++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 3 deletions(-) create mode 100644 ros2topic/test/test_pub.py diff --git a/ros2topic/ros2topic/verb/pub.py b/ros2topic/ros2topic/verb/pub.py index 7a05f030a..e2393b202 100644 --- a/ros2topic/ros2topic/verb/pub.py +++ b/ros2topic/ros2topic/verb/pub.py @@ -12,10 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. +import array +from functools import partial import time +from typing import Any +from typing import Dict +from typing import List from typing import Optional from typing import TypeVar +import numpy + import rclpy from rclpy.node import Node from rclpy.qos import QoSDurabilityPolicy @@ -27,13 +34,91 @@ from ros2topic.api import TopicNameCompleter from ros2topic.api import TopicTypeCompleter from ros2topic.verb import VerbExtension -from rosidl_runtime_py import set_message_fields +from rosidl_parser.definition import AbstractNestedType +from rosidl_parser.definition import NamespacedType +from rosidl_runtime_py.convert import get_message_slot_types +from rosidl_runtime_py.import_message import import_message_from_namespaced_type from rosidl_runtime_py.utilities import get_message import yaml MsgType = TypeVar('MsgType') +def set_message_fields_expanded( + msg: Any, values: Dict[str, str], expand_header_auto: bool = False, + expand_time_now: bool = False) -> List[Any]: + """ + Set the fields of a ROS message. + + :param msg: The ROS message to populate. + :param values: The values to set in the ROS message. The keys of the dictionary represent + fields of the message. + :param expand_header_auto: If enabled and 'auto' is passed as a value to a + 'std_msgs.msg.Header' field, an empty Header will be instantiated and a setter function + will be returned so that its 'stamp' field can be set to the current time. + :param expand_time_now: If enabled and 'now' is passed as a value to a + 'builtin_interfaces.msg.Time' field, a setter function will be returned so that + its value can be set to the current time. + :returns: A list of setter functions that can be used to update 'builtin_interfaces.msg.Time' + fields, useful for setting them to the current time. The list will be empty if the message + does not have any 'builtin_interfaces.msg.Time' fields, or if expand_header_auto and + expand_time_now are false. + :raises AttributeError: If the message does not have a field provided in the input dictionary. + :raises TypeError: If a message value does not match its field type. + """ + timestamp_fields = [] + + def set_message_fields_expanded_internal( + msg: Any, values: Dict[str, str], + timestamp_fields: List[Any]) -> List[Any]: + try: + items = values.items() + except AttributeError: + raise TypeError( + "Value '%s' is expected to be a dictionary but is a %s" % + (values, type(values).__name__)) + for field_name, field_value in items: + field = getattr(msg, field_name) + field_type = type(field) + qualified_class_name = '{}.{}'.format(field_type.__module__, field_type.__name__) + if field_type is array.array: + value = field_type(field.typecode, field_value) + elif field_type is numpy.ndarray: + value = numpy.array(field_value, dtype=field.dtype) + elif type(field_value) is field_type: + value = field_value + # We can't import these types directly, so we use the qualified class name to + # distinguish them from other fields + elif qualified_class_name == 'std_msgs.msg._header.Header' and \ + field_value == 'auto' and expand_header_auto: + timestamp_fields.append(partial(setattr, field, 'stamp')) + continue + elif qualified_class_name == 'builtin_interfaces.msg._time.Time' and \ + field_value == 'now' and expand_time_now: + timestamp_fields.append(partial(setattr, msg, field_name)) + continue + else: + try: + value = field_type(field_value) + except TypeError: + value = field_type() + set_message_fields_expanded_internal( + value, field_value, timestamp_fields) + rosidl_type = get_message_slot_types(msg)[field_name] + # Check if field is an array of ROS messages + if isinstance(rosidl_type, AbstractNestedType): + if isinstance(rosidl_type.value_type, NamespacedType): + field_elem_type = import_message_from_namespaced_type(rosidl_type.value_type) + for n in range(len(value)): + submsg = field_elem_type() + set_message_fields_expanded_internal( + submsg, value[n], timestamp_fields) + value[n] = submsg + setattr(msg, field_name, value) + set_message_fields_expanded_internal(msg, values, timestamp_fields) + return timestamp_fields + + def nonnegative_int(inval): ret = int(inval) if ret < 0: @@ -198,14 +283,17 @@ def publisher( msg = msg_module() try: - set_message_fields(msg, values_dictionary) + timestamp_fields = set_message_fields_expanded( + msg, values_dictionary, expand_header_auto=True, expand_time_now=True) except Exception as e: return 'Failed to populate field: {0}'.format(e) - print('publisher: beginning loop') count = 0 def timer_callback(): + stamp_now = node.get_clock().now().to_msg() + for field_setter in timestamp_fields: + field_setter(stamp_now) nonlocal count count += 1 if print_nth and count % print_nth == 0: diff --git a/ros2topic/test/test_pub.py b/ros2topic/test/test_pub.py new file mode 100644 index 000000000..4f79f28a8 --- /dev/null +++ b/ros2topic/test/test_pub.py @@ -0,0 +1,144 @@ +# Copyright 2022 Open Source Robotics Foundation, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import builtins + +from builtin_interfaces.msg import Time +from ros2topic.verb.pub import set_message_fields_expanded +import rosidl_parser.definition +from std_msgs.msg import Header + + +class MockMessageStamped: + + __slots__ = [ + '_header', + ] + + _fields_and_field_types = { + 'header': 'std_msgs/Header', + } + + SLOT_TYPES = ( + rosidl_parser.definition.NamespacedType(['std_msgs', 'msg'], 'Header'), + ) + + def __init__(self): + self.header = Header() + + @builtins.property + def header(self): + return self._header + + @header.setter + def header(self, value): + self._header = value + + +class MockMessageWithStampFields: + + __slots__ = [ + '_timestamp1', + '_timestamp2', + ] + + _fields_and_field_types = { + 'timestamp1': 'builtin_interfaces/Time', + 'timestamp2': 'builtin_interfaces/Time', + } + + SLOT_TYPES = ( + rosidl_parser.definition.NamespacedType(['builtin_interfaces', 'msg'], 'Time'), + rosidl_parser.definition.NamespacedType(['builtin_interfaces', 'msg'], 'Time'), + ) + + def __init__(self): + self.timestamp1 = Time() + self.timestamp2 = Time() + + @builtins.property + def timestamp1(self): + return self._timestamp1 + + @timestamp1.setter + def timestamp1(self, value): + self._timestamp1 = value + + @builtins.property + def timestamp2(self): + return self._timestamp2 + + @timestamp2.setter + def timestamp2(self, value): + self._timestamp2 = value + + +def test_set_message_fields_expanded_header_auto(): + msg = MockMessageStamped() + values = {'header': 'auto'} + assert msg.header.stamp.sec == 0 and msg.header.stamp.nanosec == 0 + assert msg.header.frame_id == '' + timestamp_fields = set_message_fields_expanded( + msg, values, expand_header_auto=True, expand_time_now=True) + assert timestamp_fields is not None + for field_setter in timestamp_fields: + stamp = Time(sec=1, nanosec=2) + field_setter(stamp) + assert msg.header.stamp.sec == 1 and msg.header.stamp.nanosec == 2 + assert msg.header.frame_id == '' + + +def test_set_message_fields_expanded_stamp_now(): + msg = MockMessageStamped() + values = {'header': {'stamp': 'now'}} + assert msg.header.stamp.sec == 0 and msg.header.stamp.nanosec == 0 + assert msg.header.frame_id == '' + timestamp_fields = set_message_fields_expanded( + msg, values, expand_header_auto=True, expand_time_now=True) + assert timestamp_fields is not None + for field_setter in timestamp_fields: + stamp = Time(sec=1, nanosec=2) + field_setter(stamp) + assert msg.header.stamp.sec == 1 and msg.header.stamp.nanosec == 2 + assert msg.header.frame_id == '' + + +def test_set_message_fields_expanded_stamp_now_with_frame_id(): + msg = MockMessageStamped() + values = {'header': {'stamp': 'now', 'frame_id': 'hello'}} + assert msg.header.stamp.sec == 0 and msg.header.stamp.nanosec == 0 + assert msg.header.frame_id == '' + timestamp_fields = set_message_fields_expanded( + msg, values, expand_header_auto=True, expand_time_now=True) + assert timestamp_fields is not None + for field_setter in timestamp_fields: + stamp = Time(sec=1, nanosec=2) + field_setter(stamp) + assert msg.header.stamp.sec == 1 and msg.header.stamp.nanosec == 2 + assert msg.header.frame_id == 'hello' + + +def test_set_message_fields_expanded_stamp_now_with_timestamp_fields(): + msg = MockMessageWithStampFields() + values = {'timestamp1': 'now', 'timestamp2': 'now'} + assert msg.timestamp1.sec == 0 and msg.timestamp1.nanosec == 0 + assert msg.timestamp2.sec == 0 and msg.timestamp2.nanosec == 0 + timestamp_fields = set_message_fields_expanded( + msg, values, expand_header_auto=True, expand_time_now=True) + assert timestamp_fields is not None + for field_setter in timestamp_fields: + stamp = Time(sec=1, nanosec=2) + field_setter(stamp) + assert msg.timestamp1.sec == 1 and msg.timestamp1.nanosec == 2 + assert msg.timestamp2.sec == 1 and msg.timestamp2.nanosec == 2 From 9e7f72150ab0c47188984787da138d6c16dde386 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 11:25:41 -0400 Subject: [PATCH 03/23] Fix the component load help to mention load, not unload. (#756) (#757) Signed-off-by: Chris Lalancette (cherry picked from commit e9789d44268fa04e98eaffab0789b6c6bbc5add4) Co-authored-by: Chris Lalancette --- ros2component/ros2component/verb/load.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2component/ros2component/verb/load.py b/ros2component/ros2component/verb/load.py index e1d3537f2..f881f3a22 100644 --- a/ros2component/ros2component/verb/load.py +++ b/ros2component/ros2component/verb/load.py @@ -30,7 +30,7 @@ class LoadVerb(VerbExtension): def add_arguments(self, parser, cli_name): add_arguments(parser) argument = parser.add_argument( - 'container_node_name', help='Container node name to unload component from' + 'container_node_name', help='Container node name to load component into' ) argument.completer = container_node_name_completer add_component_arguments(parser) From 74bd3ebb59ec0e4d3ee4e508aae43195c5b4a792 Mon Sep 17 00:00:00 2001 From: Audrow Nash Date: Mon, 7 Nov 2022 09:27:08 -0600 Subject: [PATCH 04/23] 0.18.4 Signed-off-by: Audrow Nash --- ros2action/CHANGELOG.rst | 3 +++ ros2action/package.xml | 2 +- ros2action/setup.py | 2 +- ros2cli/CHANGELOG.rst | 5 +++++ ros2cli/package.xml | 2 +- ros2cli/setup.py | 2 +- ros2cli_test_interfaces/CHANGELOG.rst | 3 +++ ros2cli_test_interfaces/package.xml | 2 +- ros2component/CHANGELOG.rst | 5 +++++ ros2component/package.xml | 2 +- ros2component/setup.py | 2 +- ros2doctor/CHANGELOG.rst | 3 +++ ros2doctor/package.xml | 2 +- ros2doctor/setup.py | 2 +- ros2interface/CHANGELOG.rst | 3 +++ ros2interface/package.xml | 2 +- ros2interface/setup.py | 2 +- ros2lifecycle/CHANGELOG.rst | 3 +++ ros2lifecycle/package.xml | 2 +- ros2lifecycle/setup.py | 2 +- ros2lifecycle_test_fixtures/CHANGELOG.rst | 3 +++ ros2lifecycle_test_fixtures/package.xml | 2 +- ros2multicast/CHANGELOG.rst | 3 +++ ros2multicast/package.xml | 2 +- ros2multicast/setup.py | 2 +- ros2node/CHANGELOG.rst | 3 +++ ros2node/package.xml | 2 +- ros2node/setup.py | 2 +- ros2param/CHANGELOG.rst | 3 +++ ros2param/package.xml | 2 +- ros2param/setup.py | 2 +- ros2pkg/CHANGELOG.rst | 3 +++ ros2pkg/package.xml | 2 +- ros2pkg/setup.py | 2 +- ros2run/CHANGELOG.rst | 3 +++ ros2run/package.xml | 2 +- ros2run/setup.py | 2 +- ros2service/CHANGELOG.rst | 3 +++ ros2service/package.xml | 2 +- ros2service/setup.py | 2 +- ros2topic/CHANGELOG.rst | 13 +++++++++++++ ros2topic/package.xml | 2 +- ros2topic/setup.py | 2 +- 43 files changed, 87 insertions(+), 28 deletions(-) diff --git a/ros2action/CHANGELOG.rst b/ros2action/CHANGELOG.rst index c75dc54d0..9720093b3 100644 --- a/ros2action/CHANGELOG.rst +++ b/ros2action/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2action ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2action/package.xml b/ros2action/package.xml index 617e65790..f7ca8ab9d 100644 --- a/ros2action/package.xml +++ b/ros2action/package.xml @@ -2,7 +2,7 @@ ros2action - 0.18.3 + 0.18.4 The action command for ROS 2 command line tools. diff --git a/ros2action/setup.py b/ros2action/setup.py index d9b24b77f..25b8cec83 100644 --- a/ros2action/setup.py +++ b/ros2action/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2cli/CHANGELOG.rst b/ros2cli/CHANGELOG.rst index 2435ce5ed..aebe534b5 100644 --- a/ros2cli/CHANGELOG.rst +++ b/ros2cli/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2cli ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- +* XMLRPC server accepts request from all local IP addresses. (`#729 `_) (`#733 `_) +* Contributors: mergify[bot] + 0.18.3 (2022-04-08) ------------------- * Fix importlib_metadata warning on Python 3.10. (`#706 `_) diff --git a/ros2cli/package.xml b/ros2cli/package.xml index 6ff803bd9..783bc1b1f 100644 --- a/ros2cli/package.xml +++ b/ros2cli/package.xml @@ -2,7 +2,7 @@ ros2cli - 0.18.3 + 0.18.4 Framework for ROS 2 command line tools. diff --git a/ros2cli/setup.py b/ros2cli/setup.py index c903742ae..a28078471 100644 --- a/ros2cli/setup.py +++ b/ros2cli/setup.py @@ -3,7 +3,7 @@ setup( name='ros2cli', - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), extras_require={ 'completion': ['argcomplete'], diff --git a/ros2cli_test_interfaces/CHANGELOG.rst b/ros2cli_test_interfaces/CHANGELOG.rst index f8db41aa2..fee169f32 100644 --- a/ros2cli_test_interfaces/CHANGELOG.rst +++ b/ros2cli_test_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli_test_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml index e6c4279b5..5d626978f 100644 --- a/ros2cli_test_interfaces/package.xml +++ b/ros2cli_test_interfaces/package.xml @@ -2,7 +2,7 @@ ros2cli_test_interfaces - 0.18.3 + 0.18.4 A package containing interface definitions for testing ros2cli. Aditya Pande diff --git a/ros2component/CHANGELOG.rst b/ros2component/CHANGELOG.rst index 5098f5c68..f9595a71a 100644 --- a/ros2component/CHANGELOG.rst +++ b/ros2component/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2component ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- +* Fix the component load help to mention load, not unload. (`#756 `_) (`#757 `_) +* Contributors: mergify[bot] + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2component/package.xml b/ros2component/package.xml index 940d98512..bb031d883 100644 --- a/ros2component/package.xml +++ b/ros2component/package.xml @@ -2,7 +2,7 @@ ros2component - 0.18.3 + 0.18.4 The component command for ROS 2 command line tools. diff --git a/ros2component/setup.py b/ros2component/setup.py index 904be08d3..fa5b43dbf 100644 --- a/ros2component/setup.py +++ b/ros2component/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2doctor/CHANGELOG.rst b/ros2doctor/CHANGELOG.rst index d644c9c94..93ff09c03 100644 --- a/ros2doctor/CHANGELOG.rst +++ b/ros2doctor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2doctor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- * Fix importlib_metadata warning on Python 3.10. (`#706 `_) diff --git a/ros2doctor/package.xml b/ros2doctor/package.xml index 8b82262f7..3e323864a 100644 --- a/ros2doctor/package.xml +++ b/ros2doctor/package.xml @@ -2,7 +2,7 @@ ros2doctor - 0.18.3 + 0.18.4 A command line tool to check potential issues in a ROS 2 system Aditya Pande diff --git a/ros2doctor/setup.py b/ros2doctor/setup.py index 3b26401fd..709c305c6 100644 --- a/ros2doctor/setup.py +++ b/ros2doctor/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2interface/CHANGELOG.rst b/ros2interface/CHANGELOG.rst index 9cde86e7b..b82a33222 100644 --- a/ros2interface/CHANGELOG.rst +++ b/ros2interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2interface/package.xml b/ros2interface/package.xml index ea31700a5..79326f4c5 100644 --- a/ros2interface/package.xml +++ b/ros2interface/package.xml @@ -2,7 +2,7 @@ ros2interface - 0.18.3 + 0.18.4 The interface command for ROS 2 command line tools diff --git a/ros2interface/setup.py b/ros2interface/setup.py index 7cb0e0e8f..49cb2873f 100644 --- a/ros2interface/setup.py +++ b/ros2interface/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle/CHANGELOG.rst b/ros2lifecycle/CHANGELOG.rst index a7d1b8500..5ed35fd6e 100644 --- a/ros2lifecycle/CHANGELOG.rst +++ b/ros2lifecycle/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2lifecycle/package.xml b/ros2lifecycle/package.xml index c93abdf61..8ae0e15c2 100644 --- a/ros2lifecycle/package.xml +++ b/ros2lifecycle/package.xml @@ -2,7 +2,7 @@ ros2lifecycle - 0.18.3 + 0.18.4 The lifecycle command for ROS 2 command line tools. diff --git a/ros2lifecycle/setup.py b/ros2lifecycle/setup.py index 18283957d..8686c3692 100644 --- a/ros2lifecycle/setup.py +++ b/ros2lifecycle/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle_test_fixtures/CHANGELOG.rst b/ros2lifecycle_test_fixtures/CHANGELOG.rst index 0ef06b0b4..3a6d73a0d 100644 --- a/ros2lifecycle_test_fixtures/CHANGELOG.rst +++ b/ros2lifecycle_test_fixtures/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle_test_fixtures ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2lifecycle_test_fixtures/package.xml b/ros2lifecycle_test_fixtures/package.xml index 21c7d42fa..8c82ec9ef 100644 --- a/ros2lifecycle_test_fixtures/package.xml +++ b/ros2lifecycle_test_fixtures/package.xml @@ -2,7 +2,7 @@ ros2lifecycle_test_fixtures - 0.18.3 + 0.18.4 Package containing fixture nodes for ros2lifecycle tests Aditya Pande diff --git a/ros2multicast/CHANGELOG.rst b/ros2multicast/CHANGELOG.rst index 4f8bd8cc9..3c47b6e40 100644 --- a/ros2multicast/CHANGELOG.rst +++ b/ros2multicast/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2multicast ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2multicast/package.xml b/ros2multicast/package.xml index d5c71343b..3f4bd463e 100644 --- a/ros2multicast/package.xml +++ b/ros2multicast/package.xml @@ -2,7 +2,7 @@ ros2multicast - 0.18.3 + 0.18.4 The multicast command for ROS 2 command line tools. diff --git a/ros2multicast/setup.py b/ros2multicast/setup.py index 7ddf8ced8..fbe0ff679 100644 --- a/ros2multicast/setup.py +++ b/ros2multicast/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2node/CHANGELOG.rst b/ros2node/CHANGELOG.rst index 6147ee9b3..ff80772de 100644 --- a/ros2node/CHANGELOG.rst +++ b/ros2node/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2node ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2node/package.xml b/ros2node/package.xml index 2cf0a3e79..2b0758652 100644 --- a/ros2node/package.xml +++ b/ros2node/package.xml @@ -2,7 +2,7 @@ ros2node - 0.18.3 + 0.18.4 The node command for ROS 2 command line tools. diff --git a/ros2node/setup.py b/ros2node/setup.py index d95df4b6f..cba24ea7c 100644 --- a/ros2node/setup.py +++ b/ros2node/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2param/CHANGELOG.rst b/ros2param/CHANGELOG.rst index 7d2574904..d10c46f47 100644 --- a/ros2param/CHANGELOG.rst +++ b/ros2param/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2param ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2param/package.xml b/ros2param/package.xml index 471c3b60a..aad452bd3 100644 --- a/ros2param/package.xml +++ b/ros2param/package.xml @@ -2,7 +2,7 @@ ros2param - 0.18.3 + 0.18.4 The param command for ROS 2 command line tools. diff --git a/ros2param/setup.py b/ros2param/setup.py index e3c14d518..7950249b2 100644 --- a/ros2param/setup.py +++ b/ros2param/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2pkg/CHANGELOG.rst b/ros2pkg/CHANGELOG.rst index 82d4c17fe..3bc92e3da 100644 --- a/ros2pkg/CHANGELOG.rst +++ b/ros2pkg/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2pkg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2pkg/package.xml b/ros2pkg/package.xml index 9774a938a..fd2692062 100644 --- a/ros2pkg/package.xml +++ b/ros2pkg/package.xml @@ -2,7 +2,7 @@ ros2pkg - 0.18.3 + 0.18.4 The pkg command for ROS 2 command line tools. diff --git a/ros2pkg/setup.py b/ros2pkg/setup.py index cf074ce9c..97c087a80 100644 --- a/ros2pkg/setup.py +++ b/ros2pkg/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2run/CHANGELOG.rst b/ros2run/CHANGELOG.rst index a1c969f12..f4286c82f 100644 --- a/ros2run/CHANGELOG.rst +++ b/ros2run/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2run ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2run/package.xml b/ros2run/package.xml index b738c2cfa..879e69a0c 100644 --- a/ros2run/package.xml +++ b/ros2run/package.xml @@ -2,7 +2,7 @@ ros2run - 0.18.3 + 0.18.4 The run command for ROS 2 command line tools. diff --git a/ros2run/setup.py b/ros2run/setup.py index 5122863af..b3ddf180e 100644 --- a/ros2run/setup.py +++ b/ros2run/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2service/CHANGELOG.rst b/ros2service/CHANGELOG.rst index dcc634c8f..3d75ba031 100644 --- a/ros2service/CHANGELOG.rst +++ b/ros2service/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2service ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2service/package.xml b/ros2service/package.xml index b83e50f73..5cde75a8b 100644 --- a/ros2service/package.xml +++ b/ros2service/package.xml @@ -2,7 +2,7 @@ ros2service - 0.18.3 + 0.18.4 The service command for ROS 2 command line tools. diff --git a/ros2service/setup.py b/ros2service/setup.py index 169d533d6..a7cce7612 100644 --- a/ros2service/setup.py +++ b/ros2service/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2topic/CHANGELOG.rst b/ros2topic/CHANGELOG.rst index 1e2281aec..b613a7701 100644 --- a/ros2topic/CHANGELOG.rst +++ b/ros2topic/CHANGELOG.rst @@ -2,6 +2,19 @@ Changelog for package ros2topic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.4 (2022-11-07) +------------------- +* [humble] Backport. Expand auto to the current time when passed to a Header field (`#751 `_) + * Expand auto to the current time when passed to a Header field + * Make sure that the stamp field is updated every time the message is published + * Added support for passing 'now' as a value to a 'builtin_interfaces.msg.Time'. Added comments and expand docstring + * Only update timestamp fields that have been passed 'now' as a value + * Fix lint errors + * Added tests + * Remove node argument from set_message_fields_expanded + * Fix flake8 errors +* Contributors: Esteve Fernandez + 0.18.3 (2022-04-08) ------------------- diff --git a/ros2topic/package.xml b/ros2topic/package.xml index 5933d01c7..75788bb1d 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -2,7 +2,7 @@ ros2topic - 0.18.3 + 0.18.4 The topic command for ROS 2 command line tools. diff --git a/ros2topic/setup.py b/ros2topic/setup.py index 2229c5074..c9b9e52fd 100644 --- a/ros2topic/setup.py +++ b/ros2topic/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.3', + version='0.18.4', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), From 1cf39d4bfa33e11050ffb05b77c39c36cf071d6d Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Tue, 22 Nov 2022 06:23:17 -0800 Subject: [PATCH 05/23] Add support use_sim_time for ros2 topic hz/bw/pub. (#754) (#777) * Add support use_sim_time for ros2 topic hz/bw/pub. Signed-off-by: Lei Liu * Add testcase. Signed-off-by: Lei Liu * Update code. Signed-off-by: Lei Liu * Update code again. Signed-off-by: Lei Liu * Add warning log. Signed-off-by: Lei Liu * Revert STEADY_TIME. Signed-off-by: Lei Liu * Fix flake8 warnings. Signed-off-by: Lei Liu * Update code. Signed-off-by: Lei Liu Signed-off-by: Lei Liu Signed-off-by: Tomoya Fujita Signed-off-by: Lei Liu Signed-off-by: Tomoya Fujita Co-authored-by: Lei Liu <64953129+llapx@users.noreply.github.com> --- ros2topic/package.xml | 1 + ros2topic/ros2topic/verb/bw.py | 17 +- ros2topic/ros2topic/verb/hz.py | 2 + ros2topic/ros2topic/verb/pub.py | 2 + ros2topic/test/test_use_sim_time.py | 259 ++++++++++++++++++++++++++++ 5 files changed, 277 insertions(+), 4 deletions(-) create mode 100644 ros2topic/test/test_use_sim_time.py diff --git a/ros2topic/package.xml b/ros2topic/package.xml index 75788bb1d..79bdb929d 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -35,6 +35,7 @@ launch_testing_ros python3-pytest python3-pytest-timeout + rosgraph_msgs std_msgs test_msgs diff --git a/ros2topic/ros2topic/verb/bw.py b/ros2topic/ros2topic/verb/bw.py index e867213df..8c03e4977 100644 --- a/ros2topic/ros2topic/verb/bw.py +++ b/ros2topic/ros2topic/verb/bw.py @@ -30,12 +30,13 @@ # https://github.com/ros/ros_comm/blob/6e5016f4b2266d8a60c9a1e163c4928b8fc7115e/tools/rostopic/src/rostopic/__init__.py from argparse import ArgumentTypeError +import sys import threading -import time import traceback import rclpy from rclpy.qos import qos_profile_sensor_data +from ros2cli.node.direct import add_arguments as add_direct_node_arguments from ros2cli.node.direct import DirectNode from ros2topic.api import get_msg_class from ros2topic.api import TopicNameCompleter @@ -79,6 +80,7 @@ def add_arguments(self, parser, cli_name): '--window', '-w', type=positive_int, default=DEFAULT_WINDOW_SIZE, help='maximum window size, in # of messages, for calculating rate ' f'(default: {DEFAULT_WINDOW_SIZE})', metavar='WINDOW') + add_direct_node_arguments(parser) def main(self, *, args): with DirectNode(args) as node: @@ -93,12 +95,14 @@ def __init__(self, node, window_size): self.sizes = [] self.times = [] self.window_size = window_size + self.use_sim_time = node.get_parameter('use_sim_time').value + self.clock = node.get_clock() def callback(self, data): """Execute ros sub callback.""" with self.lock: try: - t = time.monotonic() + t = self.clock.now() self.times.append(t) # TODO(yechun1): Subscribing to the msgs and calculate the length may be # inefficiency. To optimize here if found better solution. @@ -117,11 +121,16 @@ def print_bw(self): return with self.lock: n = len(self.times) - tn = time.monotonic() + tn = self.clock.now() t0 = self.times[0] + if tn <= t0: + print('WARNING: time is reset!', file=sys.stderr) + self.times = [] + self.sizes = [] + return None, None, None, None, None total = sum(self.sizes) - bytes_per_s = total / (tn - t0) + bytes_per_s = total / ((tn.nanoseconds - t0.nanoseconds) * 1.e-9) mean = total / n # min and max diff --git a/ros2topic/ros2topic/verb/hz.py b/ros2topic/ros2topic/verb/hz.py index 2ae9c3cc4..18a7b9f0a 100644 --- a/ros2topic/ros2topic/verb/hz.py +++ b/ros2topic/ros2topic/verb/hz.py @@ -41,6 +41,7 @@ from rclpy.clock import Clock from rclpy.clock import ClockType from rclpy.qos import qos_profile_sensor_data +from ros2cli.node.direct import add_arguments as add_direct_node_arguments from ros2cli.node.direct import DirectNode from ros2topic.api import get_msg_class from ros2topic.api import TopicNameCompleter @@ -82,6 +83,7 @@ def add_arguments(self, parser, cli_name): dest='use_wtime', default=False, action='store_true', help='calculates rate using wall time which can be helpful' ' when clock is not published during simulation') + add_direct_node_arguments(parser) def main(self, *, args): return main(args) diff --git a/ros2topic/ros2topic/verb/pub.py b/ros2topic/ros2topic/verb/pub.py index e2393b202..d0d88c297 100644 --- a/ros2topic/ros2topic/verb/pub.py +++ b/ros2topic/ros2topic/verb/pub.py @@ -28,6 +28,7 @@ from rclpy.qos import QoSDurabilityPolicy from rclpy.qos import QoSProfile from rclpy.qos import QoSReliabilityPolicy +from ros2cli.node.direct import add_arguments as add_direct_node_arguments from ros2cli.node.direct import DirectNode from ros2topic.api import profile_configure_short_keys from ros2topic.api import TopicMessagePrototypeCompleter @@ -215,6 +216,7 @@ def add_arguments(self, parser, cli_name): help='Quality of service durability setting to publish with ' '(overrides durability value of --qos-profile option, default: {})' .format(default_profile.durability.short_key)) + add_direct_node_arguments(parser) def main(self, *, args): return main(args) diff --git a/ros2topic/test/test_use_sim_time.py b/ros2topic/test/test_use_sim_time.py new file mode 100644 index 000000000..fcbf5e8d4 --- /dev/null +++ b/ros2topic/test/test_use_sim_time.py @@ -0,0 +1,259 @@ +# Copyright 2022 Sony Group Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import functools +import re +import sys +import unittest + +from launch import LaunchDescription +from launch.actions import ExecuteProcess + +import launch_testing +import launch_testing.actions +import launch_testing.asserts +import launch_testing.markers +import launch_testing.tools +import launch_testing_ros.tools + +import pytest + +import rclpy +from rclpy.executors import SingleThreadedExecutor +from rclpy.utilities import get_rmw_implementation_identifier + +from rosgraph_msgs.msg import Clock +from std_msgs.msg import String + + +# Skip cli tests on Windows while they exhibit pathological behavior +# https://github.com/ros2/build_farmer/issues/248 +if sys.platform.startswith('win'): + pytest.skip( + 'CLI tests can block for a pathological amount of time on Windows.', + allow_module_level=True) + + +TEST_NODE = 'cli_use_sim_time_test_node' +TEST_NAMESPACE = 'cli_use_sim_time' + + +@pytest.mark.rostest +@launch_testing.markers.keep_alive +def generate_test_description(): + return LaunchDescription([ + # Always restart daemon to isolate tests. + ExecuteProcess( + cmd=['ros2', 'daemon', 'stop'], + name='daemon-stop', + on_exit=[ + ExecuteProcess( + cmd=['ros2', 'daemon', 'start'], + name='daemon-start', + on_exit=[ + launch_testing.actions.ReadyToTest() + ], + ) + ] + ) + ]) + + +class TestROS2TopicUseSimTime(unittest.TestCase): + + def timer_callback(self): + msg = Clock() + msg.clock.sec = self.clock_sec + self.publisher.publish(msg) + self.clock_sec += 1 + + def setUp(self): + self.context = rclpy.context.Context() + rclpy.init(context=self.context) + self.node = rclpy.create_node( + TEST_NODE, namespace=TEST_NAMESPACE, context=self.context + ) + self.publisher = self.node.create_publisher(Clock, '/clock', 10) + self.executor = SingleThreadedExecutor(context=self.context) + self.executor.add_node(self.node) + + def tearDown(self): + self.node.destroy_node() + rclpy.shutdown(context=self.context) + + @launch_testing.markers.retry_on_failure(times=5) + def test_pub_times(self, launch_service, proc_info, proc_output): + # test method: + # speed up sim time to half second, then expect the process + # will end at half time compare to system time (5s). + self.clock_sec = 0 + # Let's speed up 2x fast + rate = 0.5 + clock_timer = self.node.create_timer(rate, self.timer_callback) + + try: + # pub 5 times with default rate of 1 hz. + command_action = ExecuteProcess( + cmd=['ros2', 'topic', 'pub', '-t', str(5), '-w', '0', '-s', + '/clitest/topic/pub', 'std_msgs/String', 'data: hello'], + additional_env={ + 'PYTHONUNBUFFERED': '1' + }, + ) + with launch_testing.tools.launch_process( + launch_service, command_action, proc_info, proc_output, + output_filter=launch_testing_ros.tools.basic_output_filter( + filtered_rmw_implementation=get_rmw_implementation_identifier() + ) + ) as command: + # The process will end up in around 2.5s (here we set 3s) + self.executor.spin_until_future_complete( + rclpy.task.Future(), timeout_sec=3 + ) + assert command.wait_for_shutdown(timeout=1) + assert launch_testing.tools.expect_output( + expected_lines=[ + 'publisher: beginning loop', + "publishing #1: std_msgs.msg.String(data='hello')", + '', + "publishing #2: std_msgs.msg.String(data='hello')", + '', + "publishing #3: std_msgs.msg.String(data='hello')", + '', + "publishing #4: std_msgs.msg.String(data='hello')", + '', + "publishing #5: std_msgs.msg.String(data='hello')", + '', + ], + text=command.output, + strict=False + ) + + finally: + # Cleanup + self.node.destroy_timer(clock_timer) + + @launch_testing.markers.retry_on_failure(times=5) + def test_pub_hz(self, launch_service, proc_info, proc_output): + # test method: + # the default publish rate is 1 hz, then we speed up the + # sim time to half second, then we expect the rate to 0.5 hz. + topic = '/clitest/topic/hz' + publisher = self.node.create_publisher(String, topic, 10) + assert publisher + + self.pub_times = 10 + + def publish_message(): + if self.pub_times == 0: + self.node.destroy_timer(publish_timer) + publisher.publish(String(data='hello')) + self.pub_times -= 1 + + publish_timer = self.node.create_timer(1.0, publish_message) + + self.clock_sec = 0 + # Let's speed up 2x fast + rate = 0.5 + clock_timer = self.node.create_timer(rate, self.timer_callback) + + try: + command_action = ExecuteProcess( + cmd=['ros2', 'topic', 'hz', '-s', topic], + additional_env={ + 'PYTHONUNBUFFERED': '1' + }, + output='screen' + ) + with launch_testing.tools.launch_process( + launch_service, command_action, proc_info, proc_output, + output_filter=launch_testing_ros.tools.basic_output_filter( + filtered_rmw_implementation=get_rmw_implementation_identifier() + ) + ) as command: + # The future won't complete - we will hit the timeout + self.executor.spin_until_future_complete( + rclpy.task.Future(), timeout_sec=5 + ) + assert command.wait_for_output(functools.partial( + launch_testing.tools.expect_output, expected_lines=[ + # without speed up, the average rate should be 1.0 + re.compile(r'average rate: 0.500'), + ], strict=False + ), timeout=10), 'Echo CLI did not print expected message' + assert command.wait_for_shutdown(timeout=10) + + finally: + # Cleanup + self.node.destroy_timer(publish_timer) + self.node.destroy_timer(clock_timer) + self.node.destroy_publisher(publisher) + + @launch_testing.markers.retry_on_failure(times=5) + def test_pub_bw(self, launch_service, proc_info, proc_output): + # test method: + # the default average band width is 16 B/s, then we speed up the + # sim time to half second, then we expect the average band width + # to 8 B/s. + topic = '/clitest/topic/bw' + publisher = self.node.create_publisher(String, topic, 10) + assert publisher + + self.pub_times = 10 + + def publish_message(): + if self.pub_times == 0: + self.node.destroy_timer(publish_timer) + publisher.publish(String(data='hello')) + self.pub_times -= 1 + + publish_timer = self.node.create_timer(1.0, publish_message) + + self.clock_sec = 0 + # Let's speed up 2x fast + rate = 0.5 + clock_timer = self.node.create_timer(rate, self.timer_callback) + + try: + command_action = ExecuteProcess( + cmd=['ros2', 'topic', 'bw', '-s', '-w', '10', topic], + additional_env={ + 'PYTHONUNBUFFERED': '1' + }, + output='screen' + ) + with launch_testing.tools.launch_process( + launch_service, command_action, proc_info, proc_output, + output_filter=launch_testing_ros.tools.basic_output_filter( + filtered_rmw_implementation=get_rmw_implementation_identifier() + ) + ) as command: + # The future won't complete - we will hit the timeout + self.executor.spin_until_future_complete( + rclpy.task.Future(), timeout_sec=10 + ) + assert command.wait_for_output(functools.partial( + launch_testing.tools.expect_output, expected_lines=[ + # without speed up, the average band width should be 16 B + re.compile(r'8 B/s from \d+ messages'), + re.compile(r'\s*Message size mean: 16 B min: 16 B max: 16 B') + ], strict=False + ), timeout=10), 'Echo CLI did not print expected message' + assert command.wait_for_shutdown(timeout=5) + + finally: + # Cleanup + self.node.destroy_timer(publish_timer) + self.node.destroy_timer(clock_timer) + self.node.destroy_publisher(publisher) From 23091822e80eba4c235c1a353705067c586a49c3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 12:50:47 -0800 Subject: [PATCH 06/23] Extend timeout to shutdown the command line process. (#783) (#784) address flaky test: https://github.com/ros2/ros2cli/issues/772 Signed-off-by: Tomoya Fujita (cherry picked from commit 615efe639fd83940c9a44356684f0e5a9c5e09a0) Co-authored-by: Tomoya Fujita --- ros2topic/test/test_use_sim_time.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2topic/test/test_use_sim_time.py b/ros2topic/test/test_use_sim_time.py index fcbf5e8d4..0a6b29902 100644 --- a/ros2topic/test/test_use_sim_time.py +++ b/ros2topic/test/test_use_sim_time.py @@ -121,7 +121,7 @@ def test_pub_times(self, launch_service, proc_info, proc_output): self.executor.spin_until_future_complete( rclpy.task.Future(), timeout_sec=3 ) - assert command.wait_for_shutdown(timeout=1) + assert command.wait_for_shutdown(timeout=5) assert launch_testing.tools.expect_output( expected_lines=[ 'publisher: beginning loop', From 4bcfdca07b68bdb136b34e7634023f1488b1a658 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 17:17:41 -0300 Subject: [PATCH 07/23] Fix network aware node issue (#785) (#786) * NewtorkAwareNode: Fix issue of using old DirectNode in method calls Signed-off-by: Ivan Santiago Paunovic * NetworkAwareNode: Check all interfaces, not only the gateways Signed-off-by: Ivan Santiago Paunovic Signed-off-by: Ivan Santiago Paunovic (cherry picked from commit 70d4991b66aa30d0b3b0ea9b9351e523b00d54ec) Co-authored-by: Ivan Santiago Paunovic --- ros2cli/ros2cli/node/network_aware.py | 33 +++++++++++++-------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/ros2cli/ros2cli/node/network_aware.py b/ros2cli/ros2cli/node/network_aware.py index 0df20ac98..d18837266 100644 --- a/ros2cli/ros2cli/node/network_aware.py +++ b/ros2cli/ros2cli/node/network_aware.py @@ -12,29 +12,23 @@ # See the License for the specific language governing permissions and # limitations under the License. +from collections import defaultdict +import functools import inspect import netifaces import rclpy -from ros2cli.helpers import before_invocation - from ros2cli.node.direct import DirectNode def get_interfaces_ip_addresses(): - addresses_by_interfaces = {} - for (kind, info_list) in netifaces.gateways().items(): - if kind not in (netifaces.AF_INET, netifaces.AF_INET6): - continue - print('Interface kind: {}, info: {}'.format(kind, info_list)) - addresses_by_interfaces[kind] = {} - for info in info_list: - interface_name = info[1] - addresses_by_interfaces[kind][interface_name] = ( - netifaces.ifaddresses(interface_name)[kind][0]['addr'] - ) - print('Addresses by interfaces: {}'.format(addresses_by_interfaces)) + addresses_by_interfaces = defaultdict(functools.partial(defaultdict, set)) + for interface_name in netifaces.interfaces(): + for kind, info_list in netifaces.ifaddresses(interface_name).items(): + for info in info_list: + addresses_by_interfaces[kind][interface_name].add(info['addr']) + print(f'Addresses by interfaces: {addresses_by_interfaces}') return addresses_by_interfaces @@ -56,8 +50,13 @@ def __getattr__(self, name): attr = getattr(self.node, name) if inspect.ismethod(attr): - return before_invocation( - attr, self.reset_if_addresses_changed) + @functools.wraps(attr) + def wrapper(*args, **kwargs): + self.reset_if_addresses_changed() + # The attribute has to be get here again, in case self.node changed + return getattr(self.node, name)(*args, **kwargs) + wrapper.__signature__ = inspect.signature(attr) + return wrapper self.reset_if_addresses_changed() return attr @@ -72,4 +71,4 @@ def reset_if_addresses_changed(self): rclpy.shutdown() self.node = DirectNode(self.args) self.node.__enter__() - print('Daemon node was reset') + print('Network interfaces changed, daemon node was reset!') From 13870ad51cb8d52dd7171407793ae0198dcc6ac4 Mon Sep 17 00:00:00 2001 From: Audrow Nash Date: Tue, 10 Jan 2023 08:03:44 -0600 Subject: [PATCH 08/23] 0.18.5 Signed-off-by: Audrow Nash --- ros2action/CHANGELOG.rst | 3 +++ ros2action/package.xml | 2 +- ros2action/setup.py | 2 +- ros2cli/CHANGELOG.rst | 5 +++++ ros2cli/package.xml | 2 +- ros2cli/setup.py | 2 +- ros2cli_test_interfaces/CHANGELOG.rst | 3 +++ ros2cli_test_interfaces/package.xml | 2 +- ros2component/CHANGELOG.rst | 3 +++ ros2component/package.xml | 2 +- ros2component/setup.py | 2 +- ros2doctor/CHANGELOG.rst | 3 +++ ros2doctor/package.xml | 2 +- ros2doctor/setup.py | 2 +- ros2interface/CHANGELOG.rst | 3 +++ ros2interface/package.xml | 2 +- ros2interface/setup.py | 2 +- ros2lifecycle/CHANGELOG.rst | 3 +++ ros2lifecycle/package.xml | 2 +- ros2lifecycle/setup.py | 2 +- ros2lifecycle_test_fixtures/CHANGELOG.rst | 3 +++ ros2lifecycle_test_fixtures/package.xml | 2 +- ros2multicast/CHANGELOG.rst | 3 +++ ros2multicast/package.xml | 2 +- ros2multicast/setup.py | 2 +- ros2node/CHANGELOG.rst | 3 +++ ros2node/package.xml | 2 +- ros2node/setup.py | 2 +- ros2param/CHANGELOG.rst | 3 +++ ros2param/package.xml | 2 +- ros2param/setup.py | 2 +- ros2pkg/CHANGELOG.rst | 3 +++ ros2pkg/package.xml | 2 +- ros2pkg/setup.py | 2 +- ros2run/CHANGELOG.rst | 3 +++ ros2run/package.xml | 2 +- ros2run/setup.py | 2 +- ros2service/CHANGELOG.rst | 3 +++ ros2service/package.xml | 2 +- ros2service/setup.py | 2 +- ros2topic/CHANGELOG.rst | 6 ++++++ ros2topic/package.xml | 2 +- ros2topic/setup.py | 2 +- 43 files changed, 78 insertions(+), 28 deletions(-) diff --git a/ros2action/CHANGELOG.rst b/ros2action/CHANGELOG.rst index 9720093b3..fbab8ff16 100644 --- a/ros2action/CHANGELOG.rst +++ b/ros2action/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2action ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2action/package.xml b/ros2action/package.xml index f7ca8ab9d..99278425a 100644 --- a/ros2action/package.xml +++ b/ros2action/package.xml @@ -2,7 +2,7 @@ ros2action - 0.18.4 + 0.18.5 The action command for ROS 2 command line tools. diff --git a/ros2action/setup.py b/ros2action/setup.py index 25b8cec83..b5ea59e8c 100644 --- a/ros2action/setup.py +++ b/ros2action/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2cli/CHANGELOG.rst b/ros2cli/CHANGELOG.rst index aebe534b5..b28e926b3 100644 --- a/ros2cli/CHANGELOG.rst +++ b/ros2cli/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2cli ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- +* Fix network aware node issue (`#785 `_) (`#786 `_) +* Contributors: mergify[bot] + 0.18.4 (2022-11-07) ------------------- * XMLRPC server accepts request from all local IP addresses. (`#729 `_) (`#733 `_) diff --git a/ros2cli/package.xml b/ros2cli/package.xml index 783bc1b1f..7870eb1e9 100644 --- a/ros2cli/package.xml +++ b/ros2cli/package.xml @@ -2,7 +2,7 @@ ros2cli - 0.18.4 + 0.18.5 Framework for ROS 2 command line tools. diff --git a/ros2cli/setup.py b/ros2cli/setup.py index a28078471..745ab4377 100644 --- a/ros2cli/setup.py +++ b/ros2cli/setup.py @@ -3,7 +3,7 @@ setup( name='ros2cli', - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), extras_require={ 'completion': ['argcomplete'], diff --git a/ros2cli_test_interfaces/CHANGELOG.rst b/ros2cli_test_interfaces/CHANGELOG.rst index fee169f32..c105f3f95 100644 --- a/ros2cli_test_interfaces/CHANGELOG.rst +++ b/ros2cli_test_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli_test_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml index 5d626978f..69ecccac0 100644 --- a/ros2cli_test_interfaces/package.xml +++ b/ros2cli_test_interfaces/package.xml @@ -2,7 +2,7 @@ ros2cli_test_interfaces - 0.18.4 + 0.18.5 A package containing interface definitions for testing ros2cli. Aditya Pande diff --git a/ros2component/CHANGELOG.rst b/ros2component/CHANGELOG.rst index f9595a71a..7b1e8b95c 100644 --- a/ros2component/CHANGELOG.rst +++ b/ros2component/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2component ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- * Fix the component load help to mention load, not unload. (`#756 `_) (`#757 `_) diff --git a/ros2component/package.xml b/ros2component/package.xml index bb031d883..2d310e50c 100644 --- a/ros2component/package.xml +++ b/ros2component/package.xml @@ -2,7 +2,7 @@ ros2component - 0.18.4 + 0.18.5 The component command for ROS 2 command line tools. diff --git a/ros2component/setup.py b/ros2component/setup.py index fa5b43dbf..fd829d266 100644 --- a/ros2component/setup.py +++ b/ros2component/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2doctor/CHANGELOG.rst b/ros2doctor/CHANGELOG.rst index 93ff09c03..186e4d8ac 100644 --- a/ros2doctor/CHANGELOG.rst +++ b/ros2doctor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2doctor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2doctor/package.xml b/ros2doctor/package.xml index 3e323864a..d62b1b21b 100644 --- a/ros2doctor/package.xml +++ b/ros2doctor/package.xml @@ -2,7 +2,7 @@ ros2doctor - 0.18.4 + 0.18.5 A command line tool to check potential issues in a ROS 2 system Aditya Pande diff --git a/ros2doctor/setup.py b/ros2doctor/setup.py index 709c305c6..8631b6d47 100644 --- a/ros2doctor/setup.py +++ b/ros2doctor/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2interface/CHANGELOG.rst b/ros2interface/CHANGELOG.rst index b82a33222..9efe2b9b4 100644 --- a/ros2interface/CHANGELOG.rst +++ b/ros2interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2interface/package.xml b/ros2interface/package.xml index 79326f4c5..d364ed2d8 100644 --- a/ros2interface/package.xml +++ b/ros2interface/package.xml @@ -2,7 +2,7 @@ ros2interface - 0.18.4 + 0.18.5 The interface command for ROS 2 command line tools diff --git a/ros2interface/setup.py b/ros2interface/setup.py index 49cb2873f..8c0bb5952 100644 --- a/ros2interface/setup.py +++ b/ros2interface/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle/CHANGELOG.rst b/ros2lifecycle/CHANGELOG.rst index 5ed35fd6e..358ba26c1 100644 --- a/ros2lifecycle/CHANGELOG.rst +++ b/ros2lifecycle/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2lifecycle/package.xml b/ros2lifecycle/package.xml index 8ae0e15c2..200a97d9a 100644 --- a/ros2lifecycle/package.xml +++ b/ros2lifecycle/package.xml @@ -2,7 +2,7 @@ ros2lifecycle - 0.18.4 + 0.18.5 The lifecycle command for ROS 2 command line tools. diff --git a/ros2lifecycle/setup.py b/ros2lifecycle/setup.py index 8686c3692..cc6f52cb3 100644 --- a/ros2lifecycle/setup.py +++ b/ros2lifecycle/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle_test_fixtures/CHANGELOG.rst b/ros2lifecycle_test_fixtures/CHANGELOG.rst index 3a6d73a0d..efc791530 100644 --- a/ros2lifecycle_test_fixtures/CHANGELOG.rst +++ b/ros2lifecycle_test_fixtures/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle_test_fixtures ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2lifecycle_test_fixtures/package.xml b/ros2lifecycle_test_fixtures/package.xml index 8c82ec9ef..24b5c74f6 100644 --- a/ros2lifecycle_test_fixtures/package.xml +++ b/ros2lifecycle_test_fixtures/package.xml @@ -2,7 +2,7 @@ ros2lifecycle_test_fixtures - 0.18.4 + 0.18.5 Package containing fixture nodes for ros2lifecycle tests Aditya Pande diff --git a/ros2multicast/CHANGELOG.rst b/ros2multicast/CHANGELOG.rst index 3c47b6e40..187621265 100644 --- a/ros2multicast/CHANGELOG.rst +++ b/ros2multicast/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2multicast ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2multicast/package.xml b/ros2multicast/package.xml index 3f4bd463e..bae354102 100644 --- a/ros2multicast/package.xml +++ b/ros2multicast/package.xml @@ -2,7 +2,7 @@ ros2multicast - 0.18.4 + 0.18.5 The multicast command for ROS 2 command line tools. diff --git a/ros2multicast/setup.py b/ros2multicast/setup.py index fbe0ff679..485a65e1a 100644 --- a/ros2multicast/setup.py +++ b/ros2multicast/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2node/CHANGELOG.rst b/ros2node/CHANGELOG.rst index ff80772de..d2f3faa87 100644 --- a/ros2node/CHANGELOG.rst +++ b/ros2node/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2node ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2node/package.xml b/ros2node/package.xml index 2b0758652..f41191ff8 100644 --- a/ros2node/package.xml +++ b/ros2node/package.xml @@ -2,7 +2,7 @@ ros2node - 0.18.4 + 0.18.5 The node command for ROS 2 command line tools. diff --git a/ros2node/setup.py b/ros2node/setup.py index cba24ea7c..41e80079b 100644 --- a/ros2node/setup.py +++ b/ros2node/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2param/CHANGELOG.rst b/ros2param/CHANGELOG.rst index d10c46f47..08351e08d 100644 --- a/ros2param/CHANGELOG.rst +++ b/ros2param/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2param ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2param/package.xml b/ros2param/package.xml index aad452bd3..489832aeb 100644 --- a/ros2param/package.xml +++ b/ros2param/package.xml @@ -2,7 +2,7 @@ ros2param - 0.18.4 + 0.18.5 The param command for ROS 2 command line tools. diff --git a/ros2param/setup.py b/ros2param/setup.py index 7950249b2..4bf58d015 100644 --- a/ros2param/setup.py +++ b/ros2param/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2pkg/CHANGELOG.rst b/ros2pkg/CHANGELOG.rst index 3bc92e3da..268b957f9 100644 --- a/ros2pkg/CHANGELOG.rst +++ b/ros2pkg/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2pkg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2pkg/package.xml b/ros2pkg/package.xml index fd2692062..2d95a0479 100644 --- a/ros2pkg/package.xml +++ b/ros2pkg/package.xml @@ -2,7 +2,7 @@ ros2pkg - 0.18.4 + 0.18.5 The pkg command for ROS 2 command line tools. diff --git a/ros2pkg/setup.py b/ros2pkg/setup.py index 97c087a80..b88fb1ab9 100644 --- a/ros2pkg/setup.py +++ b/ros2pkg/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2run/CHANGELOG.rst b/ros2run/CHANGELOG.rst index f4286c82f..a251bd273 100644 --- a/ros2run/CHANGELOG.rst +++ b/ros2run/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2run ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2run/package.xml b/ros2run/package.xml index 879e69a0c..af4e8cdcf 100644 --- a/ros2run/package.xml +++ b/ros2run/package.xml @@ -2,7 +2,7 @@ ros2run - 0.18.4 + 0.18.5 The run command for ROS 2 command line tools. diff --git a/ros2run/setup.py b/ros2run/setup.py index b3ddf180e..2e6d23779 100644 --- a/ros2run/setup.py +++ b/ros2run/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2service/CHANGELOG.rst b/ros2service/CHANGELOG.rst index 3d75ba031..27b5d10f6 100644 --- a/ros2service/CHANGELOG.rst +++ b/ros2service/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2service ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- + 0.18.4 (2022-11-07) ------------------- diff --git a/ros2service/package.xml b/ros2service/package.xml index 5cde75a8b..587eb9df8 100644 --- a/ros2service/package.xml +++ b/ros2service/package.xml @@ -2,7 +2,7 @@ ros2service - 0.18.4 + 0.18.5 The service command for ROS 2 command line tools. diff --git a/ros2service/setup.py b/ros2service/setup.py index a7cce7612..3cadecee6 100644 --- a/ros2service/setup.py +++ b/ros2service/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2topic/CHANGELOG.rst b/ros2topic/CHANGELOG.rst index b613a7701..39f45d29c 100644 --- a/ros2topic/CHANGELOG.rst +++ b/ros2topic/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog for package ros2topic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.5 (2023-01-10) +------------------- +* Extend timeout to shutdown the command line process. (`#783 `_) (`#784 `_) +* Add support use_sim_time for ros2 topic hz/bw/pub. (`#754 `_) (`#777 `_) +* Contributors: Tomoya Fujita, mergify[bot] + 0.18.4 (2022-11-07) ------------------- * [humble] Backport. Expand auto to the current time when passed to a Header field (`#751 `_) diff --git a/ros2topic/package.xml b/ros2topic/package.xml index 79bdb929d..786d688f2 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -2,7 +2,7 @@ ros2topic - 0.18.4 + 0.18.5 The topic command for ROS 2 command line tools. diff --git a/ros2topic/setup.py b/ros2topic/setup.py index c9b9e52fd..1e07c2001 100644 --- a/ros2topic/setup.py +++ b/ros2topic/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.4', + version='0.18.5', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), From e4364a72eb1a02d3ba1637e3fd94b6bf599fe2c3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 14:48:57 -0600 Subject: [PATCH 09/23] Save method list via connection check to XMLRPC server. (#796) (#798) Signed-off-by: Tomoya Fujita (cherry picked from commit e2adeac2587c091aad3164ad28eb605b8dcf8386) Co-authored-by: Tomoya Fujita --- ros2cli/ros2cli/node/daemon.py | 12 ++++++------ ros2cli/ros2cli/node/strategy.py | 3 +++ ros2cli/test/test_daemon.py | 4 ++++ ros2cli/test/test_strategy.py | 10 ++++++++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ros2cli/ros2cli/node/daemon.py b/ros2cli/ros2cli/node/daemon.py index f63527492..67989b1fe 100644 --- a/ros2cli/ros2cli/node/daemon.py +++ b/ros2cli/ros2cli/node/daemon.py @@ -39,18 +39,18 @@ def __init__(self, args): @property def connected(self): try: - self._proxy.system.listMethods() + self._methods = [ + method + for method in self._proxy.system.listMethods() + if not method.startswith('system.') + ] except ConnectionRefusedError: return False return True @property def methods(self): - return [ - method - for method in self._proxy.system.listMethods() - if not method.startswith('system.') - ] + return self._methods def __enter__(self): self._proxy.__enter__() diff --git a/ros2cli/ros2cli/node/strategy.py b/ros2cli/ros2cli/node/strategy.py index f0a4ea8b7..8f3e46cca 100644 --- a/ros2cli/ros2cli/node/strategy.py +++ b/ros2cli/ros2cli/node/strategy.py @@ -27,6 +27,9 @@ def __init__(self, args): if use_daemon and is_daemon_running(args): self._daemon_node = DaemonNode(args) self._direct_node = None + if not self._daemon_node.connected: + self._direct_node = DirectNode(args) + self._daemon_node = None else: if use_daemon: spawn_daemon(args) diff --git a/ros2cli/test/test_daemon.py b/ros2cli/test/test_daemon.py index 1df210aae..e94218d1d 100644 --- a/ros2cli/test/test_daemon.py +++ b/ros2cli/test/test_daemon.py @@ -111,6 +111,10 @@ def daemon_node(): assert shutdown_daemon(args=[], timeout=5.0) assert spawn_daemon(args=[], timeout=5.0) with DaemonNode(args=[]) as node: + if not node.connected: + pytest.fail( + f'failed to connect daemon {TEST_NODE_NAMESPACE}/{TEST_NODE_NAME}' + ) attempts = 3 delay_between_attempts = 2 # seconds for _ in range(attempts): diff --git a/ros2cli/test/test_strategy.py b/ros2cli/test/test_strategy.py index 728108185..baaa414b4 100644 --- a/ros2cli/test/test_strategy.py +++ b/ros2cli/test/test_strategy.py @@ -45,6 +45,16 @@ def test_with_daemon_running(enforce_daemon_is_running): assert direct is not None +def test_with_daemon_spawn(enforce_no_daemon_is_running): + with NodeStrategy(args=[]) as node: + assert node._daemon_node is None + assert node._direct_node is not None + # Daemon should be spawned by NodeStrategy call above + with NodeStrategy(args=[]) as node: + assert node._daemon_node is not None + assert node._direct_node is None + + def test_with_no_daemon_running(enforce_no_daemon_is_running): with NodeStrategy(args=[]) as node: assert node._daemon_node is None From 7d79d0647b042a94348134a349500d306e157a31 Mon Sep 17 00:00:00 2001 From: Audrow Nash Date: Tue, 25 Apr 2023 21:24:31 +0000 Subject: [PATCH 10/23] 0.18.6 Signed-off-by: Audrow Nash --- ros2action/CHANGELOG.rst | 3 +++ ros2action/package.xml | 2 +- ros2action/setup.py | 2 +- ros2cli/CHANGELOG.rst | 5 +++++ ros2cli/package.xml | 2 +- ros2cli/setup.py | 2 +- ros2cli_test_interfaces/CHANGELOG.rst | 3 +++ ros2cli_test_interfaces/package.xml | 2 +- ros2component/CHANGELOG.rst | 3 +++ ros2component/package.xml | 2 +- ros2component/setup.py | 2 +- ros2doctor/CHANGELOG.rst | 3 +++ ros2doctor/package.xml | 2 +- ros2doctor/setup.py | 2 +- ros2interface/CHANGELOG.rst | 3 +++ ros2interface/package.xml | 2 +- ros2interface/setup.py | 2 +- ros2lifecycle/CHANGELOG.rst | 3 +++ ros2lifecycle/package.xml | 2 +- ros2lifecycle/setup.py | 2 +- ros2lifecycle_test_fixtures/CHANGELOG.rst | 3 +++ ros2lifecycle_test_fixtures/package.xml | 2 +- ros2multicast/CHANGELOG.rst | 3 +++ ros2multicast/package.xml | 2 +- ros2multicast/setup.py | 2 +- ros2node/CHANGELOG.rst | 3 +++ ros2node/package.xml | 2 +- ros2node/setup.py | 2 +- ros2param/CHANGELOG.rst | 3 +++ ros2param/package.xml | 2 +- ros2param/setup.py | 2 +- ros2pkg/CHANGELOG.rst | 3 +++ ros2pkg/package.xml | 2 +- ros2pkg/setup.py | 2 +- ros2run/CHANGELOG.rst | 3 +++ ros2run/package.xml | 2 +- ros2run/setup.py | 2 +- ros2service/CHANGELOG.rst | 3 +++ ros2service/package.xml | 2 +- ros2service/setup.py | 2 +- ros2topic/CHANGELOG.rst | 3 +++ ros2topic/package.xml | 2 +- ros2topic/setup.py | 2 +- 43 files changed, 75 insertions(+), 28 deletions(-) diff --git a/ros2action/CHANGELOG.rst b/ros2action/CHANGELOG.rst index fbab8ff16..9e80bb3f6 100644 --- a/ros2action/CHANGELOG.rst +++ b/ros2action/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2action ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2action/package.xml b/ros2action/package.xml index 99278425a..8785ec085 100644 --- a/ros2action/package.xml +++ b/ros2action/package.xml @@ -2,7 +2,7 @@ ros2action - 0.18.5 + 0.18.6 The action command for ROS 2 command line tools. diff --git a/ros2action/setup.py b/ros2action/setup.py index b5ea59e8c..cb48cfbe6 100644 --- a/ros2action/setup.py +++ b/ros2action/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2cli/CHANGELOG.rst b/ros2cli/CHANGELOG.rst index b28e926b3..c7ea64cf1 100644 --- a/ros2cli/CHANGELOG.rst +++ b/ros2cli/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2cli ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- +* Save method list via connection check to XMLRPC server. (`#796 `_) (`#798 `_) +* Contributors: mergify[bot] + 0.18.5 (2023-01-10) ------------------- * Fix network aware node issue (`#785 `_) (`#786 `_) diff --git a/ros2cli/package.xml b/ros2cli/package.xml index 7870eb1e9..0e34afe60 100644 --- a/ros2cli/package.xml +++ b/ros2cli/package.xml @@ -2,7 +2,7 @@ ros2cli - 0.18.5 + 0.18.6 Framework for ROS 2 command line tools. diff --git a/ros2cli/setup.py b/ros2cli/setup.py index 745ab4377..c2e05ed11 100644 --- a/ros2cli/setup.py +++ b/ros2cli/setup.py @@ -3,7 +3,7 @@ setup( name='ros2cli', - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), extras_require={ 'completion': ['argcomplete'], diff --git a/ros2cli_test_interfaces/CHANGELOG.rst b/ros2cli_test_interfaces/CHANGELOG.rst index c105f3f95..277fe0bd4 100644 --- a/ros2cli_test_interfaces/CHANGELOG.rst +++ b/ros2cli_test_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli_test_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml index 69ecccac0..ce42de69e 100644 --- a/ros2cli_test_interfaces/package.xml +++ b/ros2cli_test_interfaces/package.xml @@ -2,7 +2,7 @@ ros2cli_test_interfaces - 0.18.5 + 0.18.6 A package containing interface definitions for testing ros2cli. Aditya Pande diff --git a/ros2component/CHANGELOG.rst b/ros2component/CHANGELOG.rst index 7b1e8b95c..923537ab4 100644 --- a/ros2component/CHANGELOG.rst +++ b/ros2component/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2component ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2component/package.xml b/ros2component/package.xml index 2d310e50c..84fdba30b 100644 --- a/ros2component/package.xml +++ b/ros2component/package.xml @@ -2,7 +2,7 @@ ros2component - 0.18.5 + 0.18.6 The component command for ROS 2 command line tools. diff --git a/ros2component/setup.py b/ros2component/setup.py index fd829d266..bbb2cd1af 100644 --- a/ros2component/setup.py +++ b/ros2component/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2doctor/CHANGELOG.rst b/ros2doctor/CHANGELOG.rst index 186e4d8ac..c57e4612c 100644 --- a/ros2doctor/CHANGELOG.rst +++ b/ros2doctor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2doctor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2doctor/package.xml b/ros2doctor/package.xml index d62b1b21b..f2bd85e8d 100644 --- a/ros2doctor/package.xml +++ b/ros2doctor/package.xml @@ -2,7 +2,7 @@ ros2doctor - 0.18.5 + 0.18.6 A command line tool to check potential issues in a ROS 2 system Aditya Pande diff --git a/ros2doctor/setup.py b/ros2doctor/setup.py index 8631b6d47..ce671fa61 100644 --- a/ros2doctor/setup.py +++ b/ros2doctor/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2interface/CHANGELOG.rst b/ros2interface/CHANGELOG.rst index 9efe2b9b4..66663c327 100644 --- a/ros2interface/CHANGELOG.rst +++ b/ros2interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2interface/package.xml b/ros2interface/package.xml index d364ed2d8..89aa0cca5 100644 --- a/ros2interface/package.xml +++ b/ros2interface/package.xml @@ -2,7 +2,7 @@ ros2interface - 0.18.5 + 0.18.6 The interface command for ROS 2 command line tools diff --git a/ros2interface/setup.py b/ros2interface/setup.py index 8c0bb5952..d35fbafcd 100644 --- a/ros2interface/setup.py +++ b/ros2interface/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle/CHANGELOG.rst b/ros2lifecycle/CHANGELOG.rst index 358ba26c1..2f31ee518 100644 --- a/ros2lifecycle/CHANGELOG.rst +++ b/ros2lifecycle/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2lifecycle/package.xml b/ros2lifecycle/package.xml index 200a97d9a..35814bbe1 100644 --- a/ros2lifecycle/package.xml +++ b/ros2lifecycle/package.xml @@ -2,7 +2,7 @@ ros2lifecycle - 0.18.5 + 0.18.6 The lifecycle command for ROS 2 command line tools. diff --git a/ros2lifecycle/setup.py b/ros2lifecycle/setup.py index cc6f52cb3..2f936abeb 100644 --- a/ros2lifecycle/setup.py +++ b/ros2lifecycle/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle_test_fixtures/CHANGELOG.rst b/ros2lifecycle_test_fixtures/CHANGELOG.rst index efc791530..6f5e167bd 100644 --- a/ros2lifecycle_test_fixtures/CHANGELOG.rst +++ b/ros2lifecycle_test_fixtures/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle_test_fixtures ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2lifecycle_test_fixtures/package.xml b/ros2lifecycle_test_fixtures/package.xml index 24b5c74f6..d9dbe9493 100644 --- a/ros2lifecycle_test_fixtures/package.xml +++ b/ros2lifecycle_test_fixtures/package.xml @@ -2,7 +2,7 @@ ros2lifecycle_test_fixtures - 0.18.5 + 0.18.6 Package containing fixture nodes for ros2lifecycle tests Aditya Pande diff --git a/ros2multicast/CHANGELOG.rst b/ros2multicast/CHANGELOG.rst index 187621265..145ccd34c 100644 --- a/ros2multicast/CHANGELOG.rst +++ b/ros2multicast/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2multicast ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2multicast/package.xml b/ros2multicast/package.xml index bae354102..a71fdbaf1 100644 --- a/ros2multicast/package.xml +++ b/ros2multicast/package.xml @@ -2,7 +2,7 @@ ros2multicast - 0.18.5 + 0.18.6 The multicast command for ROS 2 command line tools. diff --git a/ros2multicast/setup.py b/ros2multicast/setup.py index 485a65e1a..5f2446459 100644 --- a/ros2multicast/setup.py +++ b/ros2multicast/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2node/CHANGELOG.rst b/ros2node/CHANGELOG.rst index d2f3faa87..765fbcf35 100644 --- a/ros2node/CHANGELOG.rst +++ b/ros2node/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2node ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2node/package.xml b/ros2node/package.xml index f41191ff8..c85ae8149 100644 --- a/ros2node/package.xml +++ b/ros2node/package.xml @@ -2,7 +2,7 @@ ros2node - 0.18.5 + 0.18.6 The node command for ROS 2 command line tools. diff --git a/ros2node/setup.py b/ros2node/setup.py index 41e80079b..16a2ffc12 100644 --- a/ros2node/setup.py +++ b/ros2node/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2param/CHANGELOG.rst b/ros2param/CHANGELOG.rst index 08351e08d..4432fb9ba 100644 --- a/ros2param/CHANGELOG.rst +++ b/ros2param/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2param ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2param/package.xml b/ros2param/package.xml index 489832aeb..4298db1cd 100644 --- a/ros2param/package.xml +++ b/ros2param/package.xml @@ -2,7 +2,7 @@ ros2param - 0.18.5 + 0.18.6 The param command for ROS 2 command line tools. diff --git a/ros2param/setup.py b/ros2param/setup.py index 4bf58d015..db0281f93 100644 --- a/ros2param/setup.py +++ b/ros2param/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2pkg/CHANGELOG.rst b/ros2pkg/CHANGELOG.rst index 268b957f9..955e64cdb 100644 --- a/ros2pkg/CHANGELOG.rst +++ b/ros2pkg/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2pkg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2pkg/package.xml b/ros2pkg/package.xml index 2d95a0479..47150eb89 100644 --- a/ros2pkg/package.xml +++ b/ros2pkg/package.xml @@ -2,7 +2,7 @@ ros2pkg - 0.18.5 + 0.18.6 The pkg command for ROS 2 command line tools. diff --git a/ros2pkg/setup.py b/ros2pkg/setup.py index b88fb1ab9..1a5153753 100644 --- a/ros2pkg/setup.py +++ b/ros2pkg/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2run/CHANGELOG.rst b/ros2run/CHANGELOG.rst index a251bd273..a1b27da25 100644 --- a/ros2run/CHANGELOG.rst +++ b/ros2run/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2run ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2run/package.xml b/ros2run/package.xml index af4e8cdcf..1752fc2c1 100644 --- a/ros2run/package.xml +++ b/ros2run/package.xml @@ -2,7 +2,7 @@ ros2run - 0.18.5 + 0.18.6 The run command for ROS 2 command line tools. diff --git a/ros2run/setup.py b/ros2run/setup.py index 2e6d23779..180126cbe 100644 --- a/ros2run/setup.py +++ b/ros2run/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2service/CHANGELOG.rst b/ros2service/CHANGELOG.rst index 27b5d10f6..af7706cca 100644 --- a/ros2service/CHANGELOG.rst +++ b/ros2service/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2service ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- diff --git a/ros2service/package.xml b/ros2service/package.xml index 587eb9df8..5a430428c 100644 --- a/ros2service/package.xml +++ b/ros2service/package.xml @@ -2,7 +2,7 @@ ros2service - 0.18.5 + 0.18.6 The service command for ROS 2 command line tools. diff --git a/ros2service/setup.py b/ros2service/setup.py index 3cadecee6..e01cbdccc 100644 --- a/ros2service/setup.py +++ b/ros2service/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2topic/CHANGELOG.rst b/ros2topic/CHANGELOG.rst index 39f45d29c..ddea8a8c0 100644 --- a/ros2topic/CHANGELOG.rst +++ b/ros2topic/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2topic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.6 (2023-04-25) +------------------- + 0.18.5 (2023-01-10) ------------------- * Extend timeout to shutdown the command line process. (`#783 `_) (`#784 `_) diff --git a/ros2topic/package.xml b/ros2topic/package.xml index 786d688f2..1154fd9b4 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -2,7 +2,7 @@ ros2topic - 0.18.5 + 0.18.6 The topic command for ROS 2 command line tools. diff --git a/ros2topic/setup.py b/ros2topic/setup.py index 1e07c2001..8280b7d11 100644 --- a/ros2topic/setup.py +++ b/ros2topic/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.5', + version='0.18.6', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), From 7d5c7434cf6f7ab04fb02150f504231ebe8ea1d5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 6 May 2023 10:34:06 -0400 Subject: [PATCH 11/23] Set automatically_declare_parameters_from_overrides in DirectNode. (#813) (#815) Otherwise, the 'use_sim_time' parameter we are setting here is completely ignored. Signed-off-by: Chris Lalancette (cherry picked from commit 08fdf987a6554e5f396b0871bbf94b24c5760e13) Co-authored-by: Chris Lalancette --- ros2cli/ros2cli/node/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2cli/ros2cli/node/direct.py b/ros2cli/ros2cli/node/direct.py index 269e5aa82..1131598c9 100644 --- a/ros2cli/ros2cli/node/direct.py +++ b/ros2cli/ros2cli/node/direct.py @@ -49,7 +49,7 @@ def timer_callback(): start_parameter_services=start_parameter_services, parameter_overrides=[ Parameter('use_sim_time', value=use_sim_time) - ]) + ], automatically_declare_parameters_from_overrides=True) timeout = getattr(args, 'spin_time', DEFAULT_TIMEOUT) timer = self.node.create_timer(timeout, timer_callback) From 86ae3930d4b56171ddff6d12cd467f6570ac6932 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 13:58:36 -0400 Subject: [PATCH 12/23] resolve #790 (#801) (#832) Signed-off-by: ijnek (cherry picked from commit ad0c2a881c42e12840eaff337a5ca9db5bca3b47) Co-authored-by: Kenji Brameld --- ros2pkg/ros2pkg/resource/ament_python/setup.py.em | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ros2pkg/ros2pkg/resource/ament_python/setup.py.em b/ros2pkg/ros2pkg/resource/ament_python/setup.py.em index baab0b216..33a4acc77 100644 --- a/ros2pkg/ros2pkg/resource/ament_python/setup.py.em +++ b/ros2pkg/ros2pkg/resource/ament_python/setup.py.em @@ -1,11 +1,11 @@ -from setuptools import setup +from setuptools import find_packages, setup package_name = '@project_name' setup( name=package_name, version='0.0.0', - packages=[package_name], + packages=find_packages(exclude=['test']), data_files=[ ('share/ament_index/resource_index/packages', ['resource/' + package_name]), From 1580a03c89eb57fde325c83cab33647e08e23a6c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:21:15 +0900 Subject: [PATCH 13/23] Update ros2 param dump dosctring. (#837) (#840) """Dump the parameters of a node to a yaml file.""" -> """Show all of the parameters of a node in a YAML file format.""" Based on the documentation at https://docs.ros.org/en/rolling/How-To-Guides/Using-ros2-param.html#ros2-param-dump Signed-off-by: Murilo M. Marinho (cherry picked from commit ef5d8116a4899b069b0cb444b1fdf8e3b1b7b6d4) Co-authored-by: Murilo M Marinho <46012516+mmmarinho@users.noreply.github.com> --- ros2param/ros2param/verb/dump.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2param/ros2param/verb/dump.py b/ros2param/ros2param/verb/dump.py index 98c5b01fe..0010418de 100644 --- a/ros2param/ros2param/verb/dump.py +++ b/ros2param/ros2param/verb/dump.py @@ -37,7 +37,7 @@ class DumpVerb(VerbExtension): - """Dump the parameters of a node to a yaml file.""" + """Show all of the parameters of a node in a YAML file format.""" def add_arguments(self, parser, cli_name): # noqa: D102 add_arguments(parser) From 38d4fa97fa8091e211e190d70e9fa0b0e817689d Mon Sep 17 00:00:00 2001 From: Audrow Nash Date: Tue, 18 Jul 2023 17:20:36 +0000 Subject: [PATCH 14/23] 0.18.7 Signed-off-by: Audrow Nash --- ros2action/CHANGELOG.rst | 3 +++ ros2action/package.xml | 2 +- ros2action/setup.py | 2 +- ros2cli/CHANGELOG.rst | 5 +++++ ros2cli/package.xml | 2 +- ros2cli/setup.py | 2 +- ros2cli_test_interfaces/CHANGELOG.rst | 3 +++ ros2cli_test_interfaces/package.xml | 2 +- ros2component/CHANGELOG.rst | 3 +++ ros2component/package.xml | 2 +- ros2component/setup.py | 2 +- ros2doctor/CHANGELOG.rst | 3 +++ ros2doctor/package.xml | 2 +- ros2doctor/setup.py | 2 +- ros2interface/CHANGELOG.rst | 3 +++ ros2interface/package.xml | 2 +- ros2interface/setup.py | 2 +- ros2lifecycle/CHANGELOG.rst | 3 +++ ros2lifecycle/package.xml | 2 +- ros2lifecycle/setup.py | 2 +- ros2lifecycle_test_fixtures/CHANGELOG.rst | 3 +++ ros2lifecycle_test_fixtures/package.xml | 2 +- ros2multicast/CHANGELOG.rst | 3 +++ ros2multicast/package.xml | 2 +- ros2multicast/setup.py | 2 +- ros2node/CHANGELOG.rst | 3 +++ ros2node/package.xml | 2 +- ros2node/setup.py | 2 +- ros2param/CHANGELOG.rst | 5 +++++ ros2param/package.xml | 2 +- ros2param/setup.py | 2 +- ros2pkg/CHANGELOG.rst | 5 +++++ ros2pkg/package.xml | 2 +- ros2pkg/setup.py | 2 +- ros2run/CHANGELOG.rst | 3 +++ ros2run/package.xml | 2 +- ros2run/setup.py | 2 +- ros2service/CHANGELOG.rst | 3 +++ ros2service/package.xml | 2 +- ros2service/setup.py | 2 +- ros2topic/CHANGELOG.rst | 3 +++ ros2topic/package.xml | 2 +- ros2topic/setup.py | 2 +- 43 files changed, 79 insertions(+), 28 deletions(-) diff --git a/ros2action/CHANGELOG.rst b/ros2action/CHANGELOG.rst index 9e80bb3f6..9017f1adc 100644 --- a/ros2action/CHANGELOG.rst +++ b/ros2action/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2action ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2action/package.xml b/ros2action/package.xml index 8785ec085..01936d27b 100644 --- a/ros2action/package.xml +++ b/ros2action/package.xml @@ -2,7 +2,7 @@ ros2action - 0.18.6 + 0.18.7 The action command for ROS 2 command line tools. diff --git a/ros2action/setup.py b/ros2action/setup.py index cb48cfbe6..fcd721725 100644 --- a/ros2action/setup.py +++ b/ros2action/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2cli/CHANGELOG.rst b/ros2cli/CHANGELOG.rst index c7ea64cf1..7005664b8 100644 --- a/ros2cli/CHANGELOG.rst +++ b/ros2cli/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2cli ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- +* Set automatically_declare_parameters_from_overrides in DirectNode. (`#813 `_) (`#815 `_) +* Contributors: mergify[bot] + 0.18.6 (2023-04-25) ------------------- * Save method list via connection check to XMLRPC server. (`#796 `_) (`#798 `_) diff --git a/ros2cli/package.xml b/ros2cli/package.xml index 0e34afe60..a7a858bd4 100644 --- a/ros2cli/package.xml +++ b/ros2cli/package.xml @@ -2,7 +2,7 @@ ros2cli - 0.18.6 + 0.18.7 Framework for ROS 2 command line tools. diff --git a/ros2cli/setup.py b/ros2cli/setup.py index c2e05ed11..5699db3e6 100644 --- a/ros2cli/setup.py +++ b/ros2cli/setup.py @@ -3,7 +3,7 @@ setup( name='ros2cli', - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), extras_require={ 'completion': ['argcomplete'], diff --git a/ros2cli_test_interfaces/CHANGELOG.rst b/ros2cli_test_interfaces/CHANGELOG.rst index 277fe0bd4..36f600dba 100644 --- a/ros2cli_test_interfaces/CHANGELOG.rst +++ b/ros2cli_test_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli_test_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml index ce42de69e..210cebac7 100644 --- a/ros2cli_test_interfaces/package.xml +++ b/ros2cli_test_interfaces/package.xml @@ -2,7 +2,7 @@ ros2cli_test_interfaces - 0.18.6 + 0.18.7 A package containing interface definitions for testing ros2cli. Aditya Pande diff --git a/ros2component/CHANGELOG.rst b/ros2component/CHANGELOG.rst index 923537ab4..d3f0c429f 100644 --- a/ros2component/CHANGELOG.rst +++ b/ros2component/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2component ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2component/package.xml b/ros2component/package.xml index 84fdba30b..14ff9e02d 100644 --- a/ros2component/package.xml +++ b/ros2component/package.xml @@ -2,7 +2,7 @@ ros2component - 0.18.6 + 0.18.7 The component command for ROS 2 command line tools. diff --git a/ros2component/setup.py b/ros2component/setup.py index bbb2cd1af..a5355001d 100644 --- a/ros2component/setup.py +++ b/ros2component/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2doctor/CHANGELOG.rst b/ros2doctor/CHANGELOG.rst index c57e4612c..f8986ac60 100644 --- a/ros2doctor/CHANGELOG.rst +++ b/ros2doctor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2doctor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2doctor/package.xml b/ros2doctor/package.xml index f2bd85e8d..46e91c74a 100644 --- a/ros2doctor/package.xml +++ b/ros2doctor/package.xml @@ -2,7 +2,7 @@ ros2doctor - 0.18.6 + 0.18.7 A command line tool to check potential issues in a ROS 2 system Aditya Pande diff --git a/ros2doctor/setup.py b/ros2doctor/setup.py index ce671fa61..7f21dce1a 100644 --- a/ros2doctor/setup.py +++ b/ros2doctor/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2interface/CHANGELOG.rst b/ros2interface/CHANGELOG.rst index 66663c327..66bb8263c 100644 --- a/ros2interface/CHANGELOG.rst +++ b/ros2interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2interface/package.xml b/ros2interface/package.xml index 89aa0cca5..189eea169 100644 --- a/ros2interface/package.xml +++ b/ros2interface/package.xml @@ -2,7 +2,7 @@ ros2interface - 0.18.6 + 0.18.7 The interface command for ROS 2 command line tools diff --git a/ros2interface/setup.py b/ros2interface/setup.py index d35fbafcd..8475d1f70 100644 --- a/ros2interface/setup.py +++ b/ros2interface/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle/CHANGELOG.rst b/ros2lifecycle/CHANGELOG.rst index 2f31ee518..6b3545e36 100644 --- a/ros2lifecycle/CHANGELOG.rst +++ b/ros2lifecycle/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2lifecycle/package.xml b/ros2lifecycle/package.xml index 35814bbe1..99ca125ab 100644 --- a/ros2lifecycle/package.xml +++ b/ros2lifecycle/package.xml @@ -2,7 +2,7 @@ ros2lifecycle - 0.18.6 + 0.18.7 The lifecycle command for ROS 2 command line tools. diff --git a/ros2lifecycle/setup.py b/ros2lifecycle/setup.py index 2f936abeb..b2135e3c6 100644 --- a/ros2lifecycle/setup.py +++ b/ros2lifecycle/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle_test_fixtures/CHANGELOG.rst b/ros2lifecycle_test_fixtures/CHANGELOG.rst index 6f5e167bd..7f0620208 100644 --- a/ros2lifecycle_test_fixtures/CHANGELOG.rst +++ b/ros2lifecycle_test_fixtures/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle_test_fixtures ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2lifecycle_test_fixtures/package.xml b/ros2lifecycle_test_fixtures/package.xml index d9dbe9493..d254198bc 100644 --- a/ros2lifecycle_test_fixtures/package.xml +++ b/ros2lifecycle_test_fixtures/package.xml @@ -2,7 +2,7 @@ ros2lifecycle_test_fixtures - 0.18.6 + 0.18.7 Package containing fixture nodes for ros2lifecycle tests Aditya Pande diff --git a/ros2multicast/CHANGELOG.rst b/ros2multicast/CHANGELOG.rst index 145ccd34c..d109f52e7 100644 --- a/ros2multicast/CHANGELOG.rst +++ b/ros2multicast/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2multicast ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2multicast/package.xml b/ros2multicast/package.xml index a71fdbaf1..9ef936b0e 100644 --- a/ros2multicast/package.xml +++ b/ros2multicast/package.xml @@ -2,7 +2,7 @@ ros2multicast - 0.18.6 + 0.18.7 The multicast command for ROS 2 command line tools. diff --git a/ros2multicast/setup.py b/ros2multicast/setup.py index 5f2446459..915715b87 100644 --- a/ros2multicast/setup.py +++ b/ros2multicast/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2node/CHANGELOG.rst b/ros2node/CHANGELOG.rst index 765fbcf35..7c1065f80 100644 --- a/ros2node/CHANGELOG.rst +++ b/ros2node/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2node ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2node/package.xml b/ros2node/package.xml index c85ae8149..f3946a540 100644 --- a/ros2node/package.xml +++ b/ros2node/package.xml @@ -2,7 +2,7 @@ ros2node - 0.18.6 + 0.18.7 The node command for ROS 2 command line tools. diff --git a/ros2node/setup.py b/ros2node/setup.py index 16a2ffc12..5e2e87ecb 100644 --- a/ros2node/setup.py +++ b/ros2node/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2param/CHANGELOG.rst b/ros2param/CHANGELOG.rst index 4432fb9ba..3df910fce 100644 --- a/ros2param/CHANGELOG.rst +++ b/ros2param/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2param ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- +* Update ros2 param dump dosctring. (`#837 `_) (`#840 `_) +* Contributors: mergify[bot] + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2param/package.xml b/ros2param/package.xml index 4298db1cd..52b170e1a 100644 --- a/ros2param/package.xml +++ b/ros2param/package.xml @@ -2,7 +2,7 @@ ros2param - 0.18.6 + 0.18.7 The param command for ROS 2 command line tools. diff --git a/ros2param/setup.py b/ros2param/setup.py index db0281f93..9e40d72be 100644 --- a/ros2param/setup.py +++ b/ros2param/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2pkg/CHANGELOG.rst b/ros2pkg/CHANGELOG.rst index 955e64cdb..1508be0be 100644 --- a/ros2pkg/CHANGELOG.rst +++ b/ros2pkg/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2pkg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- +* resolve `#790 `_ (`#801 `_) (`#832 `_) +* Contributors: mergify[bot] + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2pkg/package.xml b/ros2pkg/package.xml index 47150eb89..8db5405dd 100644 --- a/ros2pkg/package.xml +++ b/ros2pkg/package.xml @@ -2,7 +2,7 @@ ros2pkg - 0.18.6 + 0.18.7 The pkg command for ROS 2 command line tools. diff --git a/ros2pkg/setup.py b/ros2pkg/setup.py index 1a5153753..aab62915c 100644 --- a/ros2pkg/setup.py +++ b/ros2pkg/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2run/CHANGELOG.rst b/ros2run/CHANGELOG.rst index a1b27da25..3cc981aa5 100644 --- a/ros2run/CHANGELOG.rst +++ b/ros2run/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2run ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2run/package.xml b/ros2run/package.xml index 1752fc2c1..ba3807b9f 100644 --- a/ros2run/package.xml +++ b/ros2run/package.xml @@ -2,7 +2,7 @@ ros2run - 0.18.6 + 0.18.7 The run command for ROS 2 command line tools. diff --git a/ros2run/setup.py b/ros2run/setup.py index 180126cbe..6cacf9c27 100644 --- a/ros2run/setup.py +++ b/ros2run/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2service/CHANGELOG.rst b/ros2service/CHANGELOG.rst index af7706cca..64badee1c 100644 --- a/ros2service/CHANGELOG.rst +++ b/ros2service/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2service ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2service/package.xml b/ros2service/package.xml index 5a430428c..f65ac4268 100644 --- a/ros2service/package.xml +++ b/ros2service/package.xml @@ -2,7 +2,7 @@ ros2service - 0.18.6 + 0.18.7 The service command for ROS 2 command line tools. diff --git a/ros2service/setup.py b/ros2service/setup.py index e01cbdccc..a80d2e7eb 100644 --- a/ros2service/setup.py +++ b/ros2service/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2topic/CHANGELOG.rst b/ros2topic/CHANGELOG.rst index ddea8a8c0..299a958e1 100644 --- a/ros2topic/CHANGELOG.rst +++ b/ros2topic/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2topic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.7 (2023-07-18) +------------------- + 0.18.6 (2023-04-25) ------------------- diff --git a/ros2topic/package.xml b/ros2topic/package.xml index 1154fd9b4..6c7af698a 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -2,7 +2,7 @@ ros2topic - 0.18.6 + 0.18.7 The topic command for ROS 2 command line tools. diff --git a/ros2topic/setup.py b/ros2topic/setup.py index 8280b7d11..eb0aba450 100644 --- a/ros2topic/setup.py +++ b/ros2topic/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.6', + version='0.18.7', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), From 9dd90cf81cc73a62452b0a38c3d72336d584f5cf Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:28:03 -0800 Subject: [PATCH 15/23] catch ExternalShutdownException ros2cli main. (#854) (#859) Signed-off-by: Tomoya Fujita (cherry picked from commit 0084d12983f0e1632d85d8936e8a210e0cfd826c) Co-authored-by: Tomoya Fujita --- ros2cli/ros2cli/cli.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ros2cli/ros2cli/cli.py b/ros2cli/ros2cli/cli.py index fb9123054..d3292769a 100644 --- a/ros2cli/ros2cli/cli.py +++ b/ros2cli/ros2cli/cli.py @@ -19,6 +19,8 @@ import signal import sys +from rclpy.executors import ExternalShutdownException + from ros2cli.command import add_subparsers_on_demand @@ -89,6 +91,8 @@ def main(*, script_name='ros2', argv=None, description=None, extension=None): rc = extension.main(parser=parser, args=args) except KeyboardInterrupt: rc = signal.SIGINT + except ExternalShutdownException: + rc = signal.SIGTERM except RuntimeError as e: rc = str(e) return rc From 61f98ce6103e762c248e1a08fba4f5a2033eb06c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 26 Dec 2023 23:04:26 -0800 Subject: [PATCH 16/23] make handles not inheritable to prevent from blocking durning tab-completion (#852) (#873) * make file handles not inheritable before spawn the daemon Signed-off-by: Chen Lihui Co-authored-by: Chris Lalancette (cherry picked from commit d32d820b5cfbfb6eba5a02910f2dd68430a6ba12) Co-authored-by: Chen Lihui --- ros2cli/ros2cli/node/daemon.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ros2cli/ros2cli/node/daemon.py b/ros2cli/ros2cli/node/daemon.py index 67989b1fe..bfa4f8fd2 100644 --- a/ros2cli/ros2cli/node/daemon.py +++ b/ros2cli/ros2cli/node/daemon.py @@ -14,6 +14,8 @@ import errno import functools +import os +import platform import socket import rclpy @@ -130,6 +132,22 @@ def spawn_daemon(args, timeout=None, debug=False): return False raise + # During tab completion on the ros2 tooling, we can get here and attempt to spawn a daemon. + # In that scenario, there may be open file descriptors that can prevent us from successfully + # daemonizing, and instead cause the terminal to hang. Here we mark all file handles except + # for 0, 1, 2, and the server socket as non-inheritable, which will cause daemonize() to close + # those file descriptors. See https://github.com/ros2/ros2cli/issues/851 for more details. + if platform.system() != 'Windows': + import resource + soft, _ = resource.getrlimit(resource.RLIMIT_NOFILE) + for i in range(3, soft): + try: + if i != server.socket.fileno() and os.get_inheritable(i): + os.set_inheritable(i, False) + except OSError: + # Just in case the file handles might be [3(closed), ..., 8(pipe handle), ...] + continue + # Transfer XMLRPC server to daemon (and the socket with it). try: tags = { From 7cd8084ac69bd02d882ec26ffaa35d1bf6e443ad Mon Sep 17 00:00:00 2001 From: Audrow Nash Date: Wed, 24 Jan 2024 00:45:21 +0000 Subject: [PATCH 17/23] 0.18.8 Signed-off-by: Audrow Nash --- ros2action/CHANGELOG.rst | 3 +++ ros2action/package.xml | 2 +- ros2action/setup.py | 2 +- ros2cli/CHANGELOG.rst | 6 ++++++ ros2cli/package.xml | 2 +- ros2cli/setup.py | 2 +- ros2cli_test_interfaces/CHANGELOG.rst | 3 +++ ros2cli_test_interfaces/package.xml | 2 +- ros2component/CHANGELOG.rst | 3 +++ ros2component/package.xml | 2 +- ros2component/setup.py | 2 +- ros2doctor/CHANGELOG.rst | 3 +++ ros2doctor/package.xml | 2 +- ros2doctor/setup.py | 2 +- ros2interface/CHANGELOG.rst | 3 +++ ros2interface/package.xml | 2 +- ros2interface/setup.py | 2 +- ros2lifecycle/CHANGELOG.rst | 3 +++ ros2lifecycle/package.xml | 2 +- ros2lifecycle/setup.py | 2 +- ros2lifecycle_test_fixtures/CHANGELOG.rst | 3 +++ ros2lifecycle_test_fixtures/package.xml | 2 +- ros2multicast/CHANGELOG.rst | 3 +++ ros2multicast/package.xml | 2 +- ros2multicast/setup.py | 2 +- ros2node/CHANGELOG.rst | 3 +++ ros2node/package.xml | 2 +- ros2node/setup.py | 2 +- ros2param/CHANGELOG.rst | 3 +++ ros2param/package.xml | 2 +- ros2param/setup.py | 2 +- ros2pkg/CHANGELOG.rst | 3 +++ ros2pkg/package.xml | 2 +- ros2pkg/setup.py | 2 +- ros2run/CHANGELOG.rst | 3 +++ ros2run/package.xml | 2 +- ros2run/setup.py | 2 +- ros2service/CHANGELOG.rst | 3 +++ ros2service/package.xml | 2 +- ros2service/setup.py | 2 +- ros2topic/CHANGELOG.rst | 3 +++ ros2topic/package.xml | 2 +- ros2topic/setup.py | 2 +- 43 files changed, 76 insertions(+), 28 deletions(-) diff --git a/ros2action/CHANGELOG.rst b/ros2action/CHANGELOG.rst index 9017f1adc..40fbd628b 100644 --- a/ros2action/CHANGELOG.rst +++ b/ros2action/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2action ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2action/package.xml b/ros2action/package.xml index 01936d27b..f12e10430 100644 --- a/ros2action/package.xml +++ b/ros2action/package.xml @@ -2,7 +2,7 @@ ros2action - 0.18.7 + 0.18.8 The action command for ROS 2 command line tools. diff --git a/ros2action/setup.py b/ros2action/setup.py index fcd721725..4a2b8e238 100644 --- a/ros2action/setup.py +++ b/ros2action/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2cli/CHANGELOG.rst b/ros2cli/CHANGELOG.rst index 7005664b8..b486d2ec0 100644 --- a/ros2cli/CHANGELOG.rst +++ b/ros2cli/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog for package ros2cli ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- +* make handles not inheritable to prevent from blocking durning tab-completion (`#852 `_) (`#873 `_) +* catch ExternalShutdownException ros2cli main. (`#854 `_) (`#859 `_) +* Contributors: mergify[bot] + 0.18.7 (2023-07-18) ------------------- * Set automatically_declare_parameters_from_overrides in DirectNode. (`#813 `_) (`#815 `_) diff --git a/ros2cli/package.xml b/ros2cli/package.xml index a7a858bd4..f848a163f 100644 --- a/ros2cli/package.xml +++ b/ros2cli/package.xml @@ -2,7 +2,7 @@ ros2cli - 0.18.7 + 0.18.8 Framework for ROS 2 command line tools. diff --git a/ros2cli/setup.py b/ros2cli/setup.py index 5699db3e6..38d329d0e 100644 --- a/ros2cli/setup.py +++ b/ros2cli/setup.py @@ -3,7 +3,7 @@ setup( name='ros2cli', - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), extras_require={ 'completion': ['argcomplete'], diff --git a/ros2cli_test_interfaces/CHANGELOG.rst b/ros2cli_test_interfaces/CHANGELOG.rst index 36f600dba..b67e920ba 100644 --- a/ros2cli_test_interfaces/CHANGELOG.rst +++ b/ros2cli_test_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli_test_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml index 210cebac7..fa5a784c8 100644 --- a/ros2cli_test_interfaces/package.xml +++ b/ros2cli_test_interfaces/package.xml @@ -2,7 +2,7 @@ ros2cli_test_interfaces - 0.18.7 + 0.18.8 A package containing interface definitions for testing ros2cli. Aditya Pande diff --git a/ros2component/CHANGELOG.rst b/ros2component/CHANGELOG.rst index d3f0c429f..acbdc7a79 100644 --- a/ros2component/CHANGELOG.rst +++ b/ros2component/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2component ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2component/package.xml b/ros2component/package.xml index 14ff9e02d..7fe1f0842 100644 --- a/ros2component/package.xml +++ b/ros2component/package.xml @@ -2,7 +2,7 @@ ros2component - 0.18.7 + 0.18.8 The component command for ROS 2 command line tools. diff --git a/ros2component/setup.py b/ros2component/setup.py index a5355001d..c18ad07eb 100644 --- a/ros2component/setup.py +++ b/ros2component/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2doctor/CHANGELOG.rst b/ros2doctor/CHANGELOG.rst index f8986ac60..413a79efb 100644 --- a/ros2doctor/CHANGELOG.rst +++ b/ros2doctor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2doctor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2doctor/package.xml b/ros2doctor/package.xml index 46e91c74a..c4e8d46d1 100644 --- a/ros2doctor/package.xml +++ b/ros2doctor/package.xml @@ -2,7 +2,7 @@ ros2doctor - 0.18.7 + 0.18.8 A command line tool to check potential issues in a ROS 2 system Aditya Pande diff --git a/ros2doctor/setup.py b/ros2doctor/setup.py index 7f21dce1a..8105ef850 100644 --- a/ros2doctor/setup.py +++ b/ros2doctor/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2interface/CHANGELOG.rst b/ros2interface/CHANGELOG.rst index 66bb8263c..b0298e950 100644 --- a/ros2interface/CHANGELOG.rst +++ b/ros2interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2interface/package.xml b/ros2interface/package.xml index 189eea169..051ab1096 100644 --- a/ros2interface/package.xml +++ b/ros2interface/package.xml @@ -2,7 +2,7 @@ ros2interface - 0.18.7 + 0.18.8 The interface command for ROS 2 command line tools diff --git a/ros2interface/setup.py b/ros2interface/setup.py index 8475d1f70..22f6655eb 100644 --- a/ros2interface/setup.py +++ b/ros2interface/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle/CHANGELOG.rst b/ros2lifecycle/CHANGELOG.rst index 6b3545e36..f90d9dfb2 100644 --- a/ros2lifecycle/CHANGELOG.rst +++ b/ros2lifecycle/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2lifecycle/package.xml b/ros2lifecycle/package.xml index 99ca125ab..3d9e55874 100644 --- a/ros2lifecycle/package.xml +++ b/ros2lifecycle/package.xml @@ -2,7 +2,7 @@ ros2lifecycle - 0.18.7 + 0.18.8 The lifecycle command for ROS 2 command line tools. diff --git a/ros2lifecycle/setup.py b/ros2lifecycle/setup.py index b2135e3c6..a68a6ee53 100644 --- a/ros2lifecycle/setup.py +++ b/ros2lifecycle/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle_test_fixtures/CHANGELOG.rst b/ros2lifecycle_test_fixtures/CHANGELOG.rst index 7f0620208..a7ab73ffa 100644 --- a/ros2lifecycle_test_fixtures/CHANGELOG.rst +++ b/ros2lifecycle_test_fixtures/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle_test_fixtures ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2lifecycle_test_fixtures/package.xml b/ros2lifecycle_test_fixtures/package.xml index d254198bc..da463fe0d 100644 --- a/ros2lifecycle_test_fixtures/package.xml +++ b/ros2lifecycle_test_fixtures/package.xml @@ -2,7 +2,7 @@ ros2lifecycle_test_fixtures - 0.18.7 + 0.18.8 Package containing fixture nodes for ros2lifecycle tests Aditya Pande diff --git a/ros2multicast/CHANGELOG.rst b/ros2multicast/CHANGELOG.rst index d109f52e7..d164e6f20 100644 --- a/ros2multicast/CHANGELOG.rst +++ b/ros2multicast/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2multicast ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2multicast/package.xml b/ros2multicast/package.xml index 9ef936b0e..82ea6552d 100644 --- a/ros2multicast/package.xml +++ b/ros2multicast/package.xml @@ -2,7 +2,7 @@ ros2multicast - 0.18.7 + 0.18.8 The multicast command for ROS 2 command line tools. diff --git a/ros2multicast/setup.py b/ros2multicast/setup.py index 915715b87..a71d2cf64 100644 --- a/ros2multicast/setup.py +++ b/ros2multicast/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2node/CHANGELOG.rst b/ros2node/CHANGELOG.rst index 7c1065f80..7893665bb 100644 --- a/ros2node/CHANGELOG.rst +++ b/ros2node/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2node ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2node/package.xml b/ros2node/package.xml index f3946a540..630f9a0e1 100644 --- a/ros2node/package.xml +++ b/ros2node/package.xml @@ -2,7 +2,7 @@ ros2node - 0.18.7 + 0.18.8 The node command for ROS 2 command line tools. diff --git a/ros2node/setup.py b/ros2node/setup.py index 5e2e87ecb..8c73c3409 100644 --- a/ros2node/setup.py +++ b/ros2node/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2param/CHANGELOG.rst b/ros2param/CHANGELOG.rst index 3df910fce..10474c44b 100644 --- a/ros2param/CHANGELOG.rst +++ b/ros2param/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2param ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- * Update ros2 param dump dosctring. (`#837 `_) (`#840 `_) diff --git a/ros2param/package.xml b/ros2param/package.xml index 52b170e1a..d43f4466c 100644 --- a/ros2param/package.xml +++ b/ros2param/package.xml @@ -2,7 +2,7 @@ ros2param - 0.18.7 + 0.18.8 The param command for ROS 2 command line tools. diff --git a/ros2param/setup.py b/ros2param/setup.py index 9e40d72be..51ce7507c 100644 --- a/ros2param/setup.py +++ b/ros2param/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2pkg/CHANGELOG.rst b/ros2pkg/CHANGELOG.rst index 1508be0be..9100f7358 100644 --- a/ros2pkg/CHANGELOG.rst +++ b/ros2pkg/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2pkg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- * resolve `#790 `_ (`#801 `_) (`#832 `_) diff --git a/ros2pkg/package.xml b/ros2pkg/package.xml index 8db5405dd..a02a124ef 100644 --- a/ros2pkg/package.xml +++ b/ros2pkg/package.xml @@ -2,7 +2,7 @@ ros2pkg - 0.18.7 + 0.18.8 The pkg command for ROS 2 command line tools. diff --git a/ros2pkg/setup.py b/ros2pkg/setup.py index aab62915c..a6223afbe 100644 --- a/ros2pkg/setup.py +++ b/ros2pkg/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2run/CHANGELOG.rst b/ros2run/CHANGELOG.rst index 3cc981aa5..a6ae754d1 100644 --- a/ros2run/CHANGELOG.rst +++ b/ros2run/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2run ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2run/package.xml b/ros2run/package.xml index ba3807b9f..bc4cb3425 100644 --- a/ros2run/package.xml +++ b/ros2run/package.xml @@ -2,7 +2,7 @@ ros2run - 0.18.7 + 0.18.8 The run command for ROS 2 command line tools. diff --git a/ros2run/setup.py b/ros2run/setup.py index 6cacf9c27..b129442f6 100644 --- a/ros2run/setup.py +++ b/ros2run/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2service/CHANGELOG.rst b/ros2service/CHANGELOG.rst index 64badee1c..c5a363902 100644 --- a/ros2service/CHANGELOG.rst +++ b/ros2service/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2service ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2service/package.xml b/ros2service/package.xml index f65ac4268..3d5e82aed 100644 --- a/ros2service/package.xml +++ b/ros2service/package.xml @@ -2,7 +2,7 @@ ros2service - 0.18.7 + 0.18.8 The service command for ROS 2 command line tools. diff --git a/ros2service/setup.py b/ros2service/setup.py index a80d2e7eb..f2c528dcd 100644 --- a/ros2service/setup.py +++ b/ros2service/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2topic/CHANGELOG.rst b/ros2topic/CHANGELOG.rst index 299a958e1..dbb2eea76 100644 --- a/ros2topic/CHANGELOG.rst +++ b/ros2topic/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2topic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.8 (2024-01-24) +------------------- + 0.18.7 (2023-07-18) ------------------- diff --git a/ros2topic/package.xml b/ros2topic/package.xml index 6c7af698a..2a2a5910c 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -2,7 +2,7 @@ ros2topic - 0.18.7 + 0.18.8 The topic command for ROS 2 command line tools. diff --git a/ros2topic/setup.py b/ros2topic/setup.py index eb0aba450..17055d2dd 100644 --- a/ros2topic/setup.py +++ b/ros2topic/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.7', + version='0.18.8', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), From 8df36c4c8e27be7180ebca9dfaef13ccefc05b01 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 6 Feb 2024 08:03:53 -0500 Subject: [PATCH 18/23] Conditionally use valid_signals. (#880) On Python 3.6 (in RHEL-8), signal.valid_signals() does not exist. Only use it if it exists. Signed-off-by: Chris Lalancette --- ros2run/ros2run/api/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ros2run/ros2run/api/__init__.py b/ros2run/ros2run/api/__init__.py index fd592bccd..c8dffe5c8 100644 --- a/ros2run/ros2run/api/__init__.py +++ b/ros2run/ros2run/api/__init__.py @@ -70,7 +70,8 @@ def run_executable(*, path, argv, prefix=None): # therefore we continue here until the process has finished pass if process.returncode != 0: - if -process.returncode in signal.valid_signals() and os.name == 'posix': + if hasattr(signal, 'valid_signals') and -process.returncode in signal.valid_signals() \ + and os.name == 'posix': # a negative value -N indicates that the child was terminated by signal N. print(ROS2RUN_MSG_PREFIX, signal.strsignal(-process.returncode)) else: From 9c02c6b0b25f10d524836414affa3755429d87ac Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 16 Feb 2024 11:11:57 -0600 Subject: [PATCH 19/23] 0.18.9 Signed-off-by: Scott K Logan --- ros2action/CHANGELOG.rst | 3 +++ ros2action/package.xml | 2 +- ros2action/setup.py | 2 +- ros2cli/CHANGELOG.rst | 3 +++ ros2cli/package.xml | 2 +- ros2cli/setup.py | 2 +- ros2cli_test_interfaces/CHANGELOG.rst | 3 +++ ros2cli_test_interfaces/package.xml | 2 +- ros2component/CHANGELOG.rst | 3 +++ ros2component/package.xml | 2 +- ros2component/setup.py | 2 +- ros2doctor/CHANGELOG.rst | 3 +++ ros2doctor/package.xml | 2 +- ros2doctor/setup.py | 2 +- ros2interface/CHANGELOG.rst | 3 +++ ros2interface/package.xml | 2 +- ros2interface/setup.py | 2 +- ros2lifecycle/CHANGELOG.rst | 3 +++ ros2lifecycle/package.xml | 2 +- ros2lifecycle/setup.py | 2 +- ros2lifecycle_test_fixtures/CHANGELOG.rst | 3 +++ ros2lifecycle_test_fixtures/package.xml | 2 +- ros2multicast/CHANGELOG.rst | 3 +++ ros2multicast/package.xml | 2 +- ros2multicast/setup.py | 2 +- ros2node/CHANGELOG.rst | 3 +++ ros2node/package.xml | 2 +- ros2node/setup.py | 2 +- ros2param/CHANGELOG.rst | 3 +++ ros2param/package.xml | 2 +- ros2param/setup.py | 2 +- ros2pkg/CHANGELOG.rst | 3 +++ ros2pkg/package.xml | 2 +- ros2pkg/setup.py | 2 +- ros2run/CHANGELOG.rst | 5 +++++ ros2run/package.xml | 2 +- ros2run/setup.py | 2 +- ros2service/CHANGELOG.rst | 3 +++ ros2service/package.xml | 2 +- ros2service/setup.py | 2 +- ros2topic/CHANGELOG.rst | 3 +++ ros2topic/package.xml | 2 +- ros2topic/setup.py | 2 +- 43 files changed, 75 insertions(+), 28 deletions(-) diff --git a/ros2action/CHANGELOG.rst b/ros2action/CHANGELOG.rst index 40fbd628b..c57208dd4 100644 --- a/ros2action/CHANGELOG.rst +++ b/ros2action/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2action ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2action/package.xml b/ros2action/package.xml index f12e10430..ec7f20be0 100644 --- a/ros2action/package.xml +++ b/ros2action/package.xml @@ -2,7 +2,7 @@ ros2action - 0.18.8 + 0.18.9 The action command for ROS 2 command line tools. diff --git a/ros2action/setup.py b/ros2action/setup.py index 4a2b8e238..a4b6c6120 100644 --- a/ros2action/setup.py +++ b/ros2action/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2cli/CHANGELOG.rst b/ros2cli/CHANGELOG.rst index b486d2ec0..864b45ba8 100644 --- a/ros2cli/CHANGELOG.rst +++ b/ros2cli/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- * make handles not inheritable to prevent from blocking durning tab-completion (`#852 `_) (`#873 `_) diff --git a/ros2cli/package.xml b/ros2cli/package.xml index f848a163f..da86c49d0 100644 --- a/ros2cli/package.xml +++ b/ros2cli/package.xml @@ -2,7 +2,7 @@ ros2cli - 0.18.8 + 0.18.9 Framework for ROS 2 command line tools. diff --git a/ros2cli/setup.py b/ros2cli/setup.py index 38d329d0e..49194b187 100644 --- a/ros2cli/setup.py +++ b/ros2cli/setup.py @@ -3,7 +3,7 @@ setup( name='ros2cli', - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), extras_require={ 'completion': ['argcomplete'], diff --git a/ros2cli_test_interfaces/CHANGELOG.rst b/ros2cli_test_interfaces/CHANGELOG.rst index b67e920ba..05a4c6e61 100644 --- a/ros2cli_test_interfaces/CHANGELOG.rst +++ b/ros2cli_test_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli_test_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml index fa5a784c8..0a1fe80b5 100644 --- a/ros2cli_test_interfaces/package.xml +++ b/ros2cli_test_interfaces/package.xml @@ -2,7 +2,7 @@ ros2cli_test_interfaces - 0.18.8 + 0.18.9 A package containing interface definitions for testing ros2cli. Aditya Pande diff --git a/ros2component/CHANGELOG.rst b/ros2component/CHANGELOG.rst index acbdc7a79..b3e716c6d 100644 --- a/ros2component/CHANGELOG.rst +++ b/ros2component/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2component ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2component/package.xml b/ros2component/package.xml index 7fe1f0842..5b8d0b94c 100644 --- a/ros2component/package.xml +++ b/ros2component/package.xml @@ -2,7 +2,7 @@ ros2component - 0.18.8 + 0.18.9 The component command for ROS 2 command line tools. diff --git a/ros2component/setup.py b/ros2component/setup.py index c18ad07eb..93cb84395 100644 --- a/ros2component/setup.py +++ b/ros2component/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2doctor/CHANGELOG.rst b/ros2doctor/CHANGELOG.rst index 413a79efb..5a2deee3f 100644 --- a/ros2doctor/CHANGELOG.rst +++ b/ros2doctor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2doctor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2doctor/package.xml b/ros2doctor/package.xml index c4e8d46d1..60e584500 100644 --- a/ros2doctor/package.xml +++ b/ros2doctor/package.xml @@ -2,7 +2,7 @@ ros2doctor - 0.18.8 + 0.18.9 A command line tool to check potential issues in a ROS 2 system Aditya Pande diff --git a/ros2doctor/setup.py b/ros2doctor/setup.py index 8105ef850..031246530 100644 --- a/ros2doctor/setup.py +++ b/ros2doctor/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2interface/CHANGELOG.rst b/ros2interface/CHANGELOG.rst index b0298e950..3e1a0b69d 100644 --- a/ros2interface/CHANGELOG.rst +++ b/ros2interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2interface/package.xml b/ros2interface/package.xml index 051ab1096..193e8730f 100644 --- a/ros2interface/package.xml +++ b/ros2interface/package.xml @@ -2,7 +2,7 @@ ros2interface - 0.18.8 + 0.18.9 The interface command for ROS 2 command line tools diff --git a/ros2interface/setup.py b/ros2interface/setup.py index 22f6655eb..f25713317 100644 --- a/ros2interface/setup.py +++ b/ros2interface/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle/CHANGELOG.rst b/ros2lifecycle/CHANGELOG.rst index f90d9dfb2..3f5d53443 100644 --- a/ros2lifecycle/CHANGELOG.rst +++ b/ros2lifecycle/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2lifecycle/package.xml b/ros2lifecycle/package.xml index 3d9e55874..865e9ee83 100644 --- a/ros2lifecycle/package.xml +++ b/ros2lifecycle/package.xml @@ -2,7 +2,7 @@ ros2lifecycle - 0.18.8 + 0.18.9 The lifecycle command for ROS 2 command line tools. diff --git a/ros2lifecycle/setup.py b/ros2lifecycle/setup.py index a68a6ee53..ef7341ab4 100644 --- a/ros2lifecycle/setup.py +++ b/ros2lifecycle/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle_test_fixtures/CHANGELOG.rst b/ros2lifecycle_test_fixtures/CHANGELOG.rst index a7ab73ffa..e1a9acbe2 100644 --- a/ros2lifecycle_test_fixtures/CHANGELOG.rst +++ b/ros2lifecycle_test_fixtures/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle_test_fixtures ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2lifecycle_test_fixtures/package.xml b/ros2lifecycle_test_fixtures/package.xml index da463fe0d..a153b5b07 100644 --- a/ros2lifecycle_test_fixtures/package.xml +++ b/ros2lifecycle_test_fixtures/package.xml @@ -2,7 +2,7 @@ ros2lifecycle_test_fixtures - 0.18.8 + 0.18.9 Package containing fixture nodes for ros2lifecycle tests Aditya Pande diff --git a/ros2multicast/CHANGELOG.rst b/ros2multicast/CHANGELOG.rst index d164e6f20..daf3c8c2a 100644 --- a/ros2multicast/CHANGELOG.rst +++ b/ros2multicast/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2multicast ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2multicast/package.xml b/ros2multicast/package.xml index 82ea6552d..dd373c985 100644 --- a/ros2multicast/package.xml +++ b/ros2multicast/package.xml @@ -2,7 +2,7 @@ ros2multicast - 0.18.8 + 0.18.9 The multicast command for ROS 2 command line tools. diff --git a/ros2multicast/setup.py b/ros2multicast/setup.py index a71d2cf64..1feade44f 100644 --- a/ros2multicast/setup.py +++ b/ros2multicast/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2node/CHANGELOG.rst b/ros2node/CHANGELOG.rst index 7893665bb..4758a8046 100644 --- a/ros2node/CHANGELOG.rst +++ b/ros2node/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2node ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2node/package.xml b/ros2node/package.xml index 630f9a0e1..1c8e4b7c0 100644 --- a/ros2node/package.xml +++ b/ros2node/package.xml @@ -2,7 +2,7 @@ ros2node - 0.18.8 + 0.18.9 The node command for ROS 2 command line tools. diff --git a/ros2node/setup.py b/ros2node/setup.py index 8c73c3409..34df99003 100644 --- a/ros2node/setup.py +++ b/ros2node/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2param/CHANGELOG.rst b/ros2param/CHANGELOG.rst index 10474c44b..78c6d3982 100644 --- a/ros2param/CHANGELOG.rst +++ b/ros2param/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2param ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2param/package.xml b/ros2param/package.xml index d43f4466c..e2dc0a170 100644 --- a/ros2param/package.xml +++ b/ros2param/package.xml @@ -2,7 +2,7 @@ ros2param - 0.18.8 + 0.18.9 The param command for ROS 2 command line tools. diff --git a/ros2param/setup.py b/ros2param/setup.py index 51ce7507c..4a5358993 100644 --- a/ros2param/setup.py +++ b/ros2param/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2pkg/CHANGELOG.rst b/ros2pkg/CHANGELOG.rst index 9100f7358..0a8b1489f 100644 --- a/ros2pkg/CHANGELOG.rst +++ b/ros2pkg/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2pkg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2pkg/package.xml b/ros2pkg/package.xml index a02a124ef..35e1b96b8 100644 --- a/ros2pkg/package.xml +++ b/ros2pkg/package.xml @@ -2,7 +2,7 @@ ros2pkg - 0.18.8 + 0.18.9 The pkg command for ROS 2 command line tools. diff --git a/ros2pkg/setup.py b/ros2pkg/setup.py index a6223afbe..f60601af1 100644 --- a/ros2pkg/setup.py +++ b/ros2pkg/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2run/CHANGELOG.rst b/ros2run/CHANGELOG.rst index a6ae754d1..cfd7669ad 100644 --- a/ros2run/CHANGELOG.rst +++ b/ros2run/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2run ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- +* Conditionally use valid_signals (`#880 `_) +* Contributors: Chris Lalancette + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2run/package.xml b/ros2run/package.xml index bc4cb3425..90c695029 100644 --- a/ros2run/package.xml +++ b/ros2run/package.xml @@ -2,7 +2,7 @@ ros2run - 0.18.8 + 0.18.9 The run command for ROS 2 command line tools. diff --git a/ros2run/setup.py b/ros2run/setup.py index b129442f6..fc85716f3 100644 --- a/ros2run/setup.py +++ b/ros2run/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2service/CHANGELOG.rst b/ros2service/CHANGELOG.rst index c5a363902..eba5dde4f 100644 --- a/ros2service/CHANGELOG.rst +++ b/ros2service/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2service ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2service/package.xml b/ros2service/package.xml index 3d5e82aed..d97e510da 100644 --- a/ros2service/package.xml +++ b/ros2service/package.xml @@ -2,7 +2,7 @@ ros2service - 0.18.8 + 0.18.9 The service command for ROS 2 command line tools. diff --git a/ros2service/setup.py b/ros2service/setup.py index f2c528dcd..5a3b5b447 100644 --- a/ros2service/setup.py +++ b/ros2service/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2topic/CHANGELOG.rst b/ros2topic/CHANGELOG.rst index dbb2eea76..be486b13b 100644 --- a/ros2topic/CHANGELOG.rst +++ b/ros2topic/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2topic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.9 (2024-02-16) +------------------- + 0.18.8 (2024-01-24) ------------------- diff --git a/ros2topic/package.xml b/ros2topic/package.xml index 2a2a5910c..a96038af4 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -2,7 +2,7 @@ ros2topic - 0.18.8 + 0.18.9 The topic command for ROS 2 command line tools. diff --git a/ros2topic/setup.py b/ros2topic/setup.py index 17055d2dd..bfbfa8103 100644 --- a/ros2topic/setup.py +++ b/ros2topic/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.8', + version='0.18.9', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), From 22d581084b2be5c416ae7db5c4b08ec4ea1ab795 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 21:20:04 -0700 Subject: [PATCH 20/23] call get_action_interfaces() properly. (#898) (#902) Signed-off-by: Tomoya Fujita (cherry picked from commit 305ef763b83e42ebddc4802ac788869d178b6e93) Co-authored-by: Tomoya Fujita --- ros2action/ros2action/api/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2action/ros2action/api/__init__.py b/ros2action/ros2action/api/__init__.py index 2f78bd793..d0bf18d67 100644 --- a/ros2action/ros2action/api/__init__.py +++ b/ros2action/ros2action/api/__init__.py @@ -75,7 +75,7 @@ def action_name_completer(prefix, parsed_args, **kwargs): def action_type_completer(**kwargs): """Callable returning a list of action types.""" action_types = [] - for package_name, action_names in get_action_interfaces.items(): + for package_name, action_names in get_action_interfaces().items(): for action_name in action_names: action_types.append(f'{package_name}/{action_name}') return action_types From 58b61c98378fa49a4a164450f1d5222bde2e4f50 Mon Sep 17 00:00:00 2001 From: Audrow Nash Date: Wed, 15 May 2024 18:08:01 -0500 Subject: [PATCH 21/23] 0.18.10 Signed-off-by: Audrow Nash --- ros2action/CHANGELOG.rst | 5 +++++ ros2action/package.xml | 2 +- ros2action/setup.py | 2 +- ros2cli/CHANGELOG.rst | 3 +++ ros2cli/package.xml | 2 +- ros2cli/setup.py | 2 +- ros2cli_test_interfaces/CHANGELOG.rst | 3 +++ ros2cli_test_interfaces/package.xml | 2 +- ros2component/CHANGELOG.rst | 3 +++ ros2component/package.xml | 2 +- ros2component/setup.py | 2 +- ros2doctor/CHANGELOG.rst | 3 +++ ros2doctor/package.xml | 2 +- ros2doctor/setup.py | 2 +- ros2interface/CHANGELOG.rst | 3 +++ ros2interface/package.xml | 2 +- ros2interface/setup.py | 2 +- ros2lifecycle/CHANGELOG.rst | 3 +++ ros2lifecycle/package.xml | 2 +- ros2lifecycle/setup.py | 2 +- ros2lifecycle_test_fixtures/CHANGELOG.rst | 3 +++ ros2lifecycle_test_fixtures/package.xml | 2 +- ros2multicast/CHANGELOG.rst | 3 +++ ros2multicast/package.xml | 2 +- ros2multicast/setup.py | 2 +- ros2node/CHANGELOG.rst | 3 +++ ros2node/package.xml | 2 +- ros2node/setup.py | 2 +- ros2param/CHANGELOG.rst | 3 +++ ros2param/package.xml | 2 +- ros2param/setup.py | 2 +- ros2pkg/CHANGELOG.rst | 3 +++ ros2pkg/package.xml | 2 +- ros2pkg/setup.py | 2 +- ros2run/CHANGELOG.rst | 3 +++ ros2run/package.xml | 2 +- ros2run/setup.py | 2 +- ros2service/CHANGELOG.rst | 3 +++ ros2service/package.xml | 2 +- ros2service/setup.py | 2 +- ros2topic/CHANGELOG.rst | 3 +++ ros2topic/package.xml | 2 +- ros2topic/setup.py | 2 +- 43 files changed, 75 insertions(+), 28 deletions(-) diff --git a/ros2action/CHANGELOG.rst b/ros2action/CHANGELOG.rst index c57208dd4..22f2115e1 100644 --- a/ros2action/CHANGELOG.rst +++ b/ros2action/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ros2action ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- +* call get_action_interfaces() properly. (`#898 `_) (`#902 `_) +* Contributors: mergify[bot] + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2action/package.xml b/ros2action/package.xml index ec7f20be0..df31432bc 100644 --- a/ros2action/package.xml +++ b/ros2action/package.xml @@ -2,7 +2,7 @@ ros2action - 0.18.9 + 0.18.10 The action command for ROS 2 command line tools. diff --git a/ros2action/setup.py b/ros2action/setup.py index a4b6c6120..edd3628ea 100644 --- a/ros2action/setup.py +++ b/ros2action/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2cli/CHANGELOG.rst b/ros2cli/CHANGELOG.rst index 864b45ba8..6fa1504ac 100644 --- a/ros2cli/CHANGELOG.rst +++ b/ros2cli/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2cli/package.xml b/ros2cli/package.xml index da86c49d0..31564ada5 100644 --- a/ros2cli/package.xml +++ b/ros2cli/package.xml @@ -2,7 +2,7 @@ ros2cli - 0.18.9 + 0.18.10 Framework for ROS 2 command line tools. diff --git a/ros2cli/setup.py b/ros2cli/setup.py index 49194b187..e58435f6a 100644 --- a/ros2cli/setup.py +++ b/ros2cli/setup.py @@ -3,7 +3,7 @@ setup( name='ros2cli', - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), extras_require={ 'completion': ['argcomplete'], diff --git a/ros2cli_test_interfaces/CHANGELOG.rst b/ros2cli_test_interfaces/CHANGELOG.rst index 05a4c6e61..f9c147b10 100644 --- a/ros2cli_test_interfaces/CHANGELOG.rst +++ b/ros2cli_test_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2cli_test_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml index 0a1fe80b5..1e8e82dce 100644 --- a/ros2cli_test_interfaces/package.xml +++ b/ros2cli_test_interfaces/package.xml @@ -2,7 +2,7 @@ ros2cli_test_interfaces - 0.18.9 + 0.18.10 A package containing interface definitions for testing ros2cli. Aditya Pande diff --git a/ros2component/CHANGELOG.rst b/ros2component/CHANGELOG.rst index b3e716c6d..e76e1b68c 100644 --- a/ros2component/CHANGELOG.rst +++ b/ros2component/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2component ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2component/package.xml b/ros2component/package.xml index 5b8d0b94c..c9347b3e8 100644 --- a/ros2component/package.xml +++ b/ros2component/package.xml @@ -2,7 +2,7 @@ ros2component - 0.18.9 + 0.18.10 The component command for ROS 2 command line tools. diff --git a/ros2component/setup.py b/ros2component/setup.py index 93cb84395..cf2493b1e 100644 --- a/ros2component/setup.py +++ b/ros2component/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2doctor/CHANGELOG.rst b/ros2doctor/CHANGELOG.rst index 5a2deee3f..ae37d4ff6 100644 --- a/ros2doctor/CHANGELOG.rst +++ b/ros2doctor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2doctor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2doctor/package.xml b/ros2doctor/package.xml index 60e584500..8d8dae2dd 100644 --- a/ros2doctor/package.xml +++ b/ros2doctor/package.xml @@ -2,7 +2,7 @@ ros2doctor - 0.18.9 + 0.18.10 A command line tool to check potential issues in a ROS 2 system Aditya Pande diff --git a/ros2doctor/setup.py b/ros2doctor/setup.py index 031246530..3a3d12bd6 100644 --- a/ros2doctor/setup.py +++ b/ros2doctor/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2interface/CHANGELOG.rst b/ros2interface/CHANGELOG.rst index 3e1a0b69d..8e9d8af09 100644 --- a/ros2interface/CHANGELOG.rst +++ b/ros2interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2interface/package.xml b/ros2interface/package.xml index 193e8730f..8d90723be 100644 --- a/ros2interface/package.xml +++ b/ros2interface/package.xml @@ -2,7 +2,7 @@ ros2interface - 0.18.9 + 0.18.10 The interface command for ROS 2 command line tools diff --git a/ros2interface/setup.py b/ros2interface/setup.py index f25713317..a48d63913 100644 --- a/ros2interface/setup.py +++ b/ros2interface/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle/CHANGELOG.rst b/ros2lifecycle/CHANGELOG.rst index 3f5d53443..162919896 100644 --- a/ros2lifecycle/CHANGELOG.rst +++ b/ros2lifecycle/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2lifecycle/package.xml b/ros2lifecycle/package.xml index 865e9ee83..5a4c97504 100644 --- a/ros2lifecycle/package.xml +++ b/ros2lifecycle/package.xml @@ -2,7 +2,7 @@ ros2lifecycle - 0.18.9 + 0.18.10 The lifecycle command for ROS 2 command line tools. diff --git a/ros2lifecycle/setup.py b/ros2lifecycle/setup.py index ef7341ab4..84be52643 100644 --- a/ros2lifecycle/setup.py +++ b/ros2lifecycle/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2lifecycle_test_fixtures/CHANGELOG.rst b/ros2lifecycle_test_fixtures/CHANGELOG.rst index e1a9acbe2..3cb5d22a9 100644 --- a/ros2lifecycle_test_fixtures/CHANGELOG.rst +++ b/ros2lifecycle_test_fixtures/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2lifecycle_test_fixtures ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2lifecycle_test_fixtures/package.xml b/ros2lifecycle_test_fixtures/package.xml index a153b5b07..ab51eb619 100644 --- a/ros2lifecycle_test_fixtures/package.xml +++ b/ros2lifecycle_test_fixtures/package.xml @@ -2,7 +2,7 @@ ros2lifecycle_test_fixtures - 0.18.9 + 0.18.10 Package containing fixture nodes for ros2lifecycle tests Aditya Pande diff --git a/ros2multicast/CHANGELOG.rst b/ros2multicast/CHANGELOG.rst index daf3c8c2a..262bbeb67 100644 --- a/ros2multicast/CHANGELOG.rst +++ b/ros2multicast/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2multicast ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2multicast/package.xml b/ros2multicast/package.xml index dd373c985..80b2e1299 100644 --- a/ros2multicast/package.xml +++ b/ros2multicast/package.xml @@ -2,7 +2,7 @@ ros2multicast - 0.18.9 + 0.18.10 The multicast command for ROS 2 command line tools. diff --git a/ros2multicast/setup.py b/ros2multicast/setup.py index 1feade44f..d4db815fb 100644 --- a/ros2multicast/setup.py +++ b/ros2multicast/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2node/CHANGELOG.rst b/ros2node/CHANGELOG.rst index 4758a8046..aa16bff7d 100644 --- a/ros2node/CHANGELOG.rst +++ b/ros2node/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2node ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2node/package.xml b/ros2node/package.xml index 1c8e4b7c0..cdb93cbbe 100644 --- a/ros2node/package.xml +++ b/ros2node/package.xml @@ -2,7 +2,7 @@ ros2node - 0.18.9 + 0.18.10 The node command for ROS 2 command line tools. diff --git a/ros2node/setup.py b/ros2node/setup.py index 34df99003..0f4da8ed8 100644 --- a/ros2node/setup.py +++ b/ros2node/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2param/CHANGELOG.rst b/ros2param/CHANGELOG.rst index 78c6d3982..221fc6919 100644 --- a/ros2param/CHANGELOG.rst +++ b/ros2param/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2param ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2param/package.xml b/ros2param/package.xml index e2dc0a170..85d2bb43d 100644 --- a/ros2param/package.xml +++ b/ros2param/package.xml @@ -2,7 +2,7 @@ ros2param - 0.18.9 + 0.18.10 The param command for ROS 2 command line tools. diff --git a/ros2param/setup.py b/ros2param/setup.py index 4a5358993..5359845ea 100644 --- a/ros2param/setup.py +++ b/ros2param/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2pkg/CHANGELOG.rst b/ros2pkg/CHANGELOG.rst index 0a8b1489f..16c0341bd 100644 --- a/ros2pkg/CHANGELOG.rst +++ b/ros2pkg/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2pkg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2pkg/package.xml b/ros2pkg/package.xml index 35e1b96b8..4dee2e794 100644 --- a/ros2pkg/package.xml +++ b/ros2pkg/package.xml @@ -2,7 +2,7 @@ ros2pkg - 0.18.9 + 0.18.10 The pkg command for ROS 2 command line tools. diff --git a/ros2pkg/setup.py b/ros2pkg/setup.py index f60601af1..bdbc063e4 100644 --- a/ros2pkg/setup.py +++ b/ros2pkg/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2run/CHANGELOG.rst b/ros2run/CHANGELOG.rst index cfd7669ad..2279bfae6 100644 --- a/ros2run/CHANGELOG.rst +++ b/ros2run/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2run ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- * Conditionally use valid_signals (`#880 `_) diff --git a/ros2run/package.xml b/ros2run/package.xml index 90c695029..b7b240d88 100644 --- a/ros2run/package.xml +++ b/ros2run/package.xml @@ -2,7 +2,7 @@ ros2run - 0.18.9 + 0.18.10 The run command for ROS 2 command line tools. diff --git a/ros2run/setup.py b/ros2run/setup.py index fc85716f3..7c9ed6de5 100644 --- a/ros2run/setup.py +++ b/ros2run/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2service/CHANGELOG.rst b/ros2service/CHANGELOG.rst index eba5dde4f..444edcbed 100644 --- a/ros2service/CHANGELOG.rst +++ b/ros2service/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2service ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2service/package.xml b/ros2service/package.xml index d97e510da..52aec4cdb 100644 --- a/ros2service/package.xml +++ b/ros2service/package.xml @@ -2,7 +2,7 @@ ros2service - 0.18.9 + 0.18.10 The service command for ROS 2 command line tools. diff --git a/ros2service/setup.py b/ros2service/setup.py index 5a3b5b447..809800177 100644 --- a/ros2service/setup.py +++ b/ros2service/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/ros2topic/CHANGELOG.rst b/ros2topic/CHANGELOG.rst index be486b13b..c3fd1fce4 100644 --- a/ros2topic/CHANGELOG.rst +++ b/ros2topic/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros2topic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.18.10 (2024-05-15) +-------------------- + 0.18.9 (2024-02-16) ------------------- diff --git a/ros2topic/package.xml b/ros2topic/package.xml index a96038af4..e07064079 100644 --- a/ros2topic/package.xml +++ b/ros2topic/package.xml @@ -2,7 +2,7 @@ ros2topic - 0.18.9 + 0.18.10 The topic command for ROS 2 command line tools. diff --git a/ros2topic/setup.py b/ros2topic/setup.py index bfbfa8103..83477e2e2 100644 --- a/ros2topic/setup.py +++ b/ros2topic/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='0.18.9', + version='0.18.10', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), From 0c8ae6d976e2fdca1b109f5cb5e330691fe26fa0 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 09:39:58 -0700 Subject: [PATCH 22/23] ros2cli.node.daemon : try getting fdsize from /proc for open fd limit (#888) (#908) * ros2cli.node.daemon : try getting fdsize from /proc for open fd limit * - add with-block; remove linux check * - use removeprefix * - replace filter with loop Signed-off-by: akssri (cherry picked from commit 64d216cb8fafef83d046b79ee6294afb06b7c595) Co-authored-by: akssri-sony <56633622+akssri-sony@users.noreply.github.com> --- ros2cli/ros2cli/node/daemon.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ros2cli/ros2cli/node/daemon.py b/ros2cli/ros2cli/node/daemon.py index bfa4f8fd2..c25a2d847 100644 --- a/ros2cli/ros2cli/node/daemon.py +++ b/ros2cli/ros2cli/node/daemon.py @@ -138,9 +138,22 @@ def spawn_daemon(args, timeout=None, debug=False): # for 0, 1, 2, and the server socket as non-inheritable, which will cause daemonize() to close # those file descriptors. See https://github.com/ros2/ros2cli/issues/851 for more details. if platform.system() != 'Windows': - import resource - soft, _ = resource.getrlimit(resource.RLIMIT_NOFILE) - for i in range(3, soft): + # Some unices have a high soft_limit; read fdsize if available. + fdlimit = None + try: + string_to_find = 'FDSize:' + with open('/proc/self/status', 'r') as f: + for line in f: + if line.startswith(string_to_find): + fdlimit = int(line.removeprefix(string_to_find).strip()) + break + except (FileNotFoundError, ValueError): + pass + # The soft limit might be quite high on some systems. + if fdlimit is None: + import resource + fdlimit, _ = resource.getrlimit(resource.RLIMIT_NOFILE) + for i in range(3, fdlimit): try: if i != server.socket.fileno() and os.get_inheritable(i): os.set_inheritable(i, False) From 40cbb329e328c97f601f77b4afb61f0b4804e715 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Thu, 20 Jun 2024 14:04:59 +0200 Subject: [PATCH 23/23] string manipulation- python3.8 friendly --- ros2cli/ros2cli/node/daemon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2cli/ros2cli/node/daemon.py b/ros2cli/ros2cli/node/daemon.py index c25a2d847..1733bce40 100644 --- a/ros2cli/ros2cli/node/daemon.py +++ b/ros2cli/ros2cli/node/daemon.py @@ -145,7 +145,7 @@ def spawn_daemon(args, timeout=None, debug=False): with open('/proc/self/status', 'r') as f: for line in f: if line.startswith(string_to_find): - fdlimit = int(line.removeprefix(string_to_find).strip()) + fdlimit = int(line[len(string_to_find):].strip()) break except (FileNotFoundError, ValueError): pass