diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index cd3f39c3..5277959f 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -26,7 +26,9 @@ jobs: CONTAINER: ubuntu:18.04 - ROS_DISTRO: noetic CONTAINER: ubuntu:20.04 - USE_DEB : false # to use .travis.rosinstall.noetic for face_detector + - ROS_DISTRO: noetic + CONTAINER: ubuntu:20.04 + BEFORE_SCRIPT: "pip3 install -U --user pyyaml" container: ${{ matrix.CONTAINER }} steps: diff --git a/.travis.rosinstall.noetic b/.travis.rosinstall.noetic deleted file mode 100644 index 095b9eee..00000000 --- a/.travis.rosinstall.noetic +++ /dev/null @@ -1,3 +0,0 @@ -- tar: - local-name: face_detector - uri: https://github.com/OSUrobotics/people-release/archive/refs/tags/debian/ros-noetic-face-detector_1.4.0-1_focal.tar.gz diff --git a/jsk_rqt_plugins/src/jsk_rqt_plugins/tabbed_button_general.py b/jsk_rqt_plugins/src/jsk_rqt_plugins/tabbed_button_general.py index 0dbf8662..f5a34e82 100644 --- a/jsk_rqt_plugins/src/jsk_rqt_plugins/tabbed_button_general.py +++ b/jsk_rqt_plugins/src/jsk_rqt_plugins/tabbed_button_general.py @@ -162,7 +162,7 @@ def __init__(self, settings): resolved_yaml = resolved_yaml[len("file://"):] with open(resolved_yaml) as f: - yaml_data = yaml.load(f) + yaml_data = yaml.safe_load(f) self.setupButtons_with_yaml_data(yaml_data=yaml_data, namespace=namespace) self.show()