Merge remote-tracking branch 'ROS2/rolling' into feature/inject-calla…

…bles

Signed-off-by: Pintaudi Giorgio <[email protected]>

launch_ros/CHANGELOG.rst

@@ -2,6 +2,16 @@
 Changelog for package launch_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.28.0 (2024-11-20)
+-------------------
+* Add ament_xmllint to the ament_python packages. (`#423 <https://github.com/ros2/launch_ros/issues/423>`_)
+* Contributors: Chris Lalancette
+
+0.27.3 (2024-10-03)
+-------------------
+* Fix url in setup.py (`#413 <https://github.com/ros2/launch_ros/issues/413>`_)
+* Contributors: Wei HU
+
 0.27.2 (2024-07-29)
 -------------------
 

launch_ros/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>launch_ros</name>
-  <version>0.27.2</version>
+  <version>0.28.0</version>
   <description>ROS specific extensions to the launch tool.</description>
 
   <maintainer email="[email protected]">Aditya Pande</maintainer>
@@ -17,18 +17,19 @@
   <author email="[email protected]">Michel Hidalgo</author>
   <author email="[email protected]">William Woodall</author>
 
-  <depend>ament_index_python</depend>
-  <depend>launch</depend>
-  <depend>lifecycle_msgs</depend>
-  <depend>osrf_pycommon</depend>
-  <depend>rclpy</depend>
-  <depend>python3-importlib-metadata</depend>
-  <depend>python3-yaml</depend>
-  <depend>composition_interfaces</depend>
+  <exec_depend>ament_index_python</exec_depend>
+  <exec_depend>composition_interfaces</exec_depend>
+  <exec_depend>launch</exec_depend>
+  <exec_depend>lifecycle_msgs</exec_depend>
+  <exec_depend>osrf_pycommon</exec_depend>
+  <exec_depend>python3-importlib-metadata</exec_depend>
+  <exec_depend>python3-yaml</exec_depend>
+  <exec_depend>rclpy</exec_depend>
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
+  <test_depend>ament_xmllint</test_depend>
   <test_depend>python3-pytest</test_depend>
 
   <export>

launch_ros/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name=package_name,
-    version='0.27.2',
+    version='0.28.0',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),
@@ -25,8 +25,8 @@
     author_email='[email protected]',
     maintainer='Aditya Pande, Brandon Ong',
     maintainer_email='[email protected], [email protected]',
-    url='https://github.com/ros2/launch',
-    download_url='https://github.com/ros2/launch/releases',
+    url='https://github.com/ros2/launch_ros',
+    download_url='https://github.com/ros2/launch_ros/releases',
     keywords=['ROS'],
     classifiers=[
         'Intended Audience :: Developers',

launch_ros/test/test_xmllint.py

@@ -0,0 +1,23 @@
+# Copyright 2019 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.
+
+from ament_xmllint.main import main
+import pytest
+
+
+@pytest.mark.linter
+@pytest.mark.xmllint
+def test_xmllint():
+    rc = main(argv=[])
+    assert rc == 0, 'Found errors'

launch_testing_ros/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog for package launch_testing_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.28.0 (2024-11-20)
+-------------------
+* Add ament_xmllint to the ament_python packages. (`#423 <https://github.com/ros2/launch_ros/issues/423>`_)
+* Contributors: Chris Lalancette
+
+0.27.3 (2024-10-03)
+-------------------
+
 0.27.2 (2024-07-29)
 -------------------
 * Switch to use rclpy.init context manager. (`#402 <https://github.com/ros2/launch_ros/issues/402>`_)

launch_testing_ros/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>launch_testing_ros</name>
-  <version>0.27.2</version>
+  <version>0.28.0</version>
   <description>A package providing utilities for writing ROS2 enabled launch tests.</description>
 
   <maintainer email="[email protected]">Aditya Pande</maintainer>
@@ -23,6 +23,7 @@
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
+  <test_depend>ament_xmllint</test_depend>
   <test_depend>python3-pytest</test_depend>
   <test_depend>std_msgs</test_depend>
 

launch_testing_ros/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='launch_testing_ros',
-    version='0.27.2',
+    version='0.28.0',
     packages=find_packages(exclude=['test']),
     py_modules=['launch_testing_ros_pytest_entrypoint'],
     data_files=[

launch_testing_ros/test/test_xmllint.py

@@ -0,0 +1,23 @@
+# Copyright 2019 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.
+
+from ament_xmllint.main import main
+import pytest
+
+
+@pytest.mark.linter
+@pytest.mark.xmllint
+def test_xmllint():
+    rc = main(argv=[])
+    assert rc == 0, 'Found errors'

ros2launch/CHANGELOG.rst

@@ -2,6 +2,16 @@
 Changelog for package ros2launch
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.28.0 (2024-11-20)
+-------------------
+* Add ament_xmllint to the ament_python packages. (`#423 <https://github.com/ros2/launch_ros/issues/423>`_)
+* Contributors: Chris Lalancette
+
+0.27.3 (2024-10-03)
+-------------------
+* Fix url in setup.py (`#413 <https://github.com/ros2/launch_ros/issues/413>`_)
+* Contributors: Wei HU
+
 0.27.2 (2024-07-29)
 -------------------
 

ros2launch/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ros2launch</name>
-  <version>0.27.2</version>
+  <version>0.28.0</version>
   <description>
     The launch command for ROS 2 command line tools.
   </description>
@@ -19,11 +19,11 @@
   <author email="[email protected]">Michel Hidalgo</author>
   <author email="[email protected]">William Woodall</author>
 
-  <depend>ament_index_python</depend>
-  <depend>launch</depend>
-  <depend>launch_ros</depend>
-  <depend>ros2cli</depend>
-  <depend>ros2pkg</depend>
+  <exec_depend>ament_index_python</exec_depend>
+  <exec_depend>launch</exec_depend>
+  <exec_depend>launch_ros</exec_depend>
+  <exec_depend>ros2cli</exec_depend>
+  <exec_depend>ros2pkg</exec_depend>
 
   <!-- Explicit group resolution - see ros-infrastructure/catkin_pkg#369 -->
   <exec_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">launch_xml</exec_depend>
@@ -32,6 +32,7 @@
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
+  <test_depend>ament_xmllint</test_depend>
   <test_depend>python3-pytest</test_depend>
 
   <group_depend>launch_frontend_packages</group_depend>

ros2launch/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name=package_name,
-    version='0.27.2',
+    version='0.28.0',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),
@@ -18,8 +18,8 @@
     author_email='[email protected]',
     maintainer='Aditya Pande, Brandon Ong',
     maintainer_email='[email protected], [email protected]',
-    url='https://github.com/ros2/launch/tree/master/ros2launch',
-    download_url='https://github.com/ros2/launch/releases',
+    url='https://github.com/ros2/launch_ros',
+    download_url='https://github.com/ros2/launch_ros/releases',
     keywords=[],
     classifiers=[
         'Environment :: Console',

ros2launch/test/test_xmllint.py

@@ -0,0 +1,23 @@
+# Copyright 2019 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.
+
+from ament_xmllint.main import main
+import pytest
+
+
+@pytest.mark.linter
+@pytest.mark.xmllint
+def test_xmllint():
+    rc = main(argv=[])
+    assert rc == 0, 'Found errors'

test_launch_ros/CHANGELOG.rst

@@ -2,6 +2,17 @@
 Changelog for package test_launch_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.28.0 (2024-11-20)
+-------------------
+* Add ament_xmllint to the ament_python packages. (`#423 <https://github.com/ros2/launch_ros/issues/423>`_)
+* Contributors: Chris Lalancette
+
+0.27.3 (2024-10-03)
+-------------------
+* Add in a timeout for test_launch_ros. (`#417 <https://github.com/ros2/launch_ros/issues/417>`_)
+* Fix url in setup.py (`#413 <https://github.com/ros2/launch_ros/issues/413>`_)
+* Contributors: Chris Lalancette, Wei HU
+
 0.27.2 (2024-07-29)
 -------------------
 * Revamp the test_load_composable_nodes test. (`#403 <https://github.com/ros2/launch_ros/issues/403>`_)

test_launch_ros/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>test_launch_ros</name>
-  <version>0.27.2</version>
+  <version>0.28.0</version>
   <description>Tests for ROS specific extensions to the launch tool.</description>
 
   <maintainer email="[email protected]">Aditya Pande</maintainer>
@@ -20,6 +20,7 @@
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
+  <test_depend>ament_xmllint</test_depend>
   <test_depend>builtin_interfaces</test_depend>
   <test_depend>composition</test_depend>
   <test_depend>demo_nodes_py</test_depend>

test_launch_ros/pytest.ini

@@ -1,2 +1,4 @@
 [pytest]
 junit_family=xunit2
+timeout=900
+timeout_method=thread

test_launch_ros/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name=package_name,
-    version='0.27.2',
+    version='0.28.0',
     packages=find_packages(exclude=['test']),
     install_requires=[
         'setuptools',
@@ -23,8 +23,8 @@
     author_email='[email protected]',
     maintainer='Aditya Pande, Brandon Ong',
     maintainer_email='[email protected], [email protected]',
-    url='https://github.com/ros2/launch',
-    download_url='https://github.com/ros2/launch/releases',
+    url='https://github.com/ros2/launch_ros',
+    download_url='https://github.com/ros2/launch_ros/releases',
     keywords=['ROS'],
     classifiers=[
         'Intended Audience :: Developers',

test_launch_ros/test/test_xmllint.py

@@ -0,0 +1,23 @@
+# Copyright 2019 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.
+
+from ament_xmllint.main import main
+import pytest
+
+
+@pytest.mark.linter
+@pytest.mark.xmllint
+def test_xmllint():
+    rc = main(argv=[])
+    assert rc == 0, 'Found errors'