Skip to content

Commit 99dc94a

Browse files
authored
Merge pull request #373 from lbr-stack/fix/lbr-fri-ros2-stack-372/ament_cmake_pytest_on_test
depend on ament_cmake_pytest for tests only (#372)
2 parents 42d7e0f + c09dfed commit 99dc94a

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

CHANGELOG.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Jazzy v2.x (TBD)
1616
* Sets the ``k_velocity`` to fix the safety limits for effort client command modes.
1717
* Removes the controller-related parts from the ``*_description.xacro`` files, now named ``*.urdf.xacro``.
1818
* Fix tests.
19-
19+
* Depend on ``ament_cmake_pytest`` for tests only.
2020
* ``lbr_ros2_control``: Uses the joint limits as obtained from the joints inside the URDF, previously redundant in ``<command_interface>`` tags.
2121
* Related pull requests:
2222

2323
* Namespace argument: https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/344, https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/353
2424
* Effort limits: https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/357
2525
* URDF de-coupling: https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/359
2626
* Ament target dependencies: https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/364
27-
* Test fixes: https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/367
27+
* Test fixes: https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/367, https://github.com/lbr-stack/lbr_fri_ros2_stack/pull/373
2828

2929
Jazzy v2.4.3 (2025-12-09)
3030
--------------------------

lbr_description/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ endif()
77

88
# find dependencies
99
find_package(ament_cmake REQUIRED)
10-
find_package(ament_cmake_pytest REQUIRED)
1110

1211
# install
1312
install(
@@ -18,6 +17,7 @@ install(
1817
ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.dsv")
1918

2019
if(BUILD_TESTING)
20+
find_package(ament_cmake_pytest REQUIRED)
2121
ament_add_pytest_test(test_urdf ${CMAKE_CURRENT_SOURCE_DIR}/test/test_urdf.py)
2222
endif()
2323

lbr_description/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<license>Apache-2.0</license>
99

1010
<buildtool_depend>ament_cmake</buildtool_depend>
11-
<buildtool_depend>ament_cmake_pytest</buildtool_depend>
1211

1312
<exec_depend>gz_ros2_control</exec_depend>
1413
<exec_depend>joint_state_publisher_gui</exec_depend>
@@ -17,6 +16,7 @@
1716
<exec_depend>tf2_ros</exec_depend>
1817
<exec_depend>xacro</exec_depend>
1918

19+
<test_depend>ament_cmake_pytest</test_depend>
2020
<test_depend>python3-pytest</test_depend>
2121

2222
<export>

0 commit comments

Comments
 (0)