From f0856a7cf82234cf54314f212c43813c364aa922 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 19 Jan 2024 10:14:32 +0900 Subject: [PATCH 1/2] face_detector is released, so remove .travis.rosinstall.noetic . add test to check with latest pyyaml from pip --- .github/workflows/config.yml | 4 +++- .travis.rosinstall.noetic | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 .travis.rosinstall.noetic 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 From 1a98ce85de71aac8f5172edf135ee525f501cc20 Mon Sep 17 00:00:00 2001 From: Kanazawanaoaki Date: Thu, 18 Jan 2024 20:10:51 +0900 Subject: [PATCH 2/2] [jsk_rqt_plugins] Fix yaml load in tabbed_button_general.py --- jsk_rqt_plugins/src/jsk_rqt_plugins/tabbed_button_general.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()