Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed action tutorials interfaces dependency #88

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Removed action tutorials interfaces dependency #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7308170
Removed action tutorials interfaces dependency
ahcorde Aug 30, 2024
18a7d46
update CI action to latest
bmagyar Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion joy_teleop/config/joy_teleop_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion joy_teleop/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions joy_teleop/test/test_action_fibonacci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion joy_teleop/test/test_parameter_failures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading