Removed action tutorials interfaces dependency (#88)

ros-teleop · Sep 2, 2024 · 96dd5f6 · 96dd5f6
1 parent b5038a0
commit 96dd5f6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: ros-tooling/[email protected]
         with:
           required-ros-distributions: rolling
-      - uses: ros-tooling/action-ros-ci@v0.1
+      - uses: ros-tooling/action-ros-ci@v0.3
         with:
           target-ros2-distro: rolling
           # build all packages listed in the meta package

diff --git a/joy_teleop/config/joy_teleop_example.yaml b/joy_teleop/config/joy_teleop_example.yaml
@@ -100,7 +100,7 @@ joy_teleop:
 
     fibonacci:
       type: action
-      interface_type: action_tutorials_interfaces/action/Fibonacci
+      interface_type: example_interfaces/action/Fibonacci
       action_name: fibonacci
       action_goal:
         order: 5

diff --git a/joy_teleop/package.xml b/joy_teleop/package.xml
@@ -17,7 +17,6 @@
   <exec_depend>trajectory_msgs</exec_depend>
   <exec_depend>rosidl_runtime_py</exec_depend>
 
-  <test_depend>action_tutorials_interfaces</test_depend>
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>

diff --git a/joy_teleop/test/test_action_fibonacci.py b/joy_teleop/test/test_action_fibonacci.py
@@ -32,7 +32,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import action_tutorials_interfaces.action
+import example_interfaces.action
 from joy_teleop_testing_common import generate_joy_test_description, TestJoyTeleop
 import pytest
 import rclpy
@@ -42,7 +42,7 @@
 def generate_test_description():
     parameters = {}
     parameters['fibonacci.type'] = 'action'
-    parameters['fibonacci.interface_type'] = 'action_tutorials_interfaces/action/Fibonacci'
+    parameters['fibonacci.interface_type'] = 'example_interfaces/action/Fibonacci'
     parameters['fibonacci.action_name'] = '/fibonacci'
     parameters['fibonacci.buttons'] = [2]
     parameters['fibonacci.action_goal'] = {'order': 5}
@@ -69,14 +69,14 @@ def fibonacci_callback(goal_handle):
                 sequence.append(sequence[i] + sequence[i-1])
 
             goal_handle.succeed()
-            result = action_tutorials_interfaces.action.Fibonacci.Result()
+            result = example_interfaces.action.Fibonacci.Result()
             result.sequence = sequence
             future.set_result(True)
             return result
 
         action_server = rclpy.action.ActionServer(
             self.node,
-            action_tutorials_interfaces.action.Fibonacci,
+            example_interfaces.action.Fibonacci,
             'fibonacci',
             fibonacci_callback)
 

diff --git a/joy_teleop/test/test_parameter_failures.py b/joy_teleop/test/test_parameter_failures.py
@@ -215,7 +215,7 @@ def test_service_invalid_message_fields(self):
     def test_action_invalid_message_fields(self):
         parameters = {}
         parameters['fibonacci.type'] = 'action'
-        parameters['fibonacci.interface_type'] = 'action_tutorials_interfaces/action/Fibonacci'
+        parameters['fibonacci.interface_type'] = 'example_interfaces/action/Fibonacci'
         parameters['fibonacci.action_name'] = '/fibonacci'
         parameters['fibonacci.buttons'] = [2]
         parameters['fibonacci.action_goal'] = {'foo': 5}