Skip to content

Commit 2e1cad8

Browse files
Fix the CI for the new driver
Steps: - Add missing python dependencies - Drop the `IRON` workflows. That's EOL by now. - Fix `mypy` warnings for duplicate modules - Fix the setup fixture. That would require a sourced environment
1 parent e059d52 commit 2e1cad8

File tree

3 files changed

+9
-26
lines changed

3 files changed

+9
-26
lines changed

.github/workflows/industrial_ci_iron_action.yml

-24
This file was deleted.

schunk_gripper_driver/package.xml

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
<maintainer email="[email protected]">stefan</maintainer>
88
<license>GPL-3.0-or-later</license>
99

10+
<depend>rclpy</depend>
11+
<depend>launch</depend>
12+
<depend>launch_ros</depend>
13+
14+
<test_depend>launch_pytest</test_depend>
1015
<test_depend>ament_copyright</test_depend>
1116
<test_depend>python3-pytest</test_depend>
1217
<test_depend>schunk_egu_egk_gripper_dummy</test_depend>

schunk_gripper_driver/test/conftest.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import launch_pytest
2424
import subprocess
2525
from ament_index_python.packages import get_package_share_directory
26+
import os
2627

2728

2829
# We avoid black's F811, F401 linting warnings
@@ -34,9 +35,10 @@
3435
@pytest.fixture(scope="module")
3536
def isolated():
3637
rclpy.init()
38+
env = os.environ.copy()
3739
# Make sure all test nodes find each other
38-
subprocess.run(["ros2", "daemon", "stop"])
39-
subprocess.run(["ros2", "daemon", "start"])
40+
subprocess.run(["ros2", "daemon", "stop"], check=True, env=env)
41+
subprocess.run(["ros2", "daemon", "start"], check=True, env=env)
4042
yield
4143
rclpy.shutdown()
4244

0 commit comments

Comments
 (0)