From d86bb2fa4e3150e633faf05e4742d5f5d90d48ac Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Tue, 29 Aug 2023 16:39:46 +0900 Subject: [PATCH 1/3] [docker] Fix typo --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2aeb59b30..c7063b548 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -76,7 +76,7 @@ RUN cd ~ && \ # https://github.com/jsk-ros-pkg/jsk_travis/blob/0.5.26/travis.sh#L295-L300 ARG ROS_DISTRO RUN if [ ${ROS_DISTRO} = "indigo" ] || [ ${ROS_DISTRO} = "kinetic" ]; then \ - rm /etc/ros/rosdep/sources.list.d/20-default.list; \ + rm /etc/ros/rosdep/sources.list.d/20-default.list && \ wget https://gist.githubusercontent.com/cottsay/b27a46e53b8f7453bf9ff637d32ea283/raw/476b3714bb90cfbc6b8b9d068162fc6408fa7f76/30-xenial.list -O /etc/ros/rosdep/sources.list.d/30-xenial.list; \ fi From dd6b95221d5bae22ed3298e17f249c9fa4ba97de Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Tue, 29 Aug 2023 16:43:25 +0900 Subject: [PATCH 2/3] [docker] Avoid build failure on kinetic Maybe related to: - 83954d1569e5cf93b7ec7b607dde513c0bafedf2 - 2a9f6b8839148fa792d65bbf87c372d2a778149d --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index c7063b548..639a8c7fc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -98,6 +98,9 @@ RUN if [ ${TESTING} = "true" ] ; then \ cd ~/ros/${ROS_DISTRO} && \ if [ ${ROS_DISTRO} = "indigo" ]; then \ catkin build jsk_apc2015_common jsk_apc2016_common jsk_arc2017_common jsk_2015_05_baxter_apc jsk_2016_01_baxter_apc jsk_arc2017_baxter selective_dualarm_stowing sphand_driver sphand_driver_msgs vl53l0x_mraa_ros baxtergv6_apc2016;\ + elif [ ${ROS_DISTRO} = "kinetic" ]; then \ + catkin config --blacklist test_catkin_virtualenv test_catkin_virtualenv_py3_isolated test_catkin_virtualenv_inherited && \ + catkin build; \ else \ catkin build; \ fi; \ From dc41c6a9dab771e529f192a3a4a409caef10b880 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Tue, 29 Aug 2023 19:14:59 +0900 Subject: [PATCH 3/3] Fix for noetic linter --- .../node_scripts/mask_rcnn_instance_segmentation.py | 4 ++-- .../nodes/grasp_style_server_book_picking.py | 1 + .../nodes/work_order_publisher_book_picking.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/demos/grasp_fusion/ros/grasp_fusion/node_scripts/mask_rcnn_instance_segmentation.py b/demos/grasp_fusion/ros/grasp_fusion/node_scripts/mask_rcnn_instance_segmentation.py index 08df2a87d..8a4af5529 100644 --- a/demos/grasp_fusion/ros/grasp_fusion/node_scripts/mask_rcnn_instance_segmentation.py +++ b/demos/grasp_fusion/ros/grasp_fusion/node_scripts/mask_rcnn_instance_segmentation.py @@ -145,8 +145,8 @@ def callback(self, imgmsg): if self.pub_viz.get_num_connections() > 0: n_fg_class = len(self.fg_class_names) - captions = ['{:d}: {:s}'.format(l, self.fg_class_names[l]) - for l in labels] + captions = ['{:d}: {:s}'.format(lbl, self.fg_class_names[lbl]) + for lbl in labels] viz = chainer_mask_rcnn.utils.draw_instance_bboxes( img, bboxes, labels + 1, n_class=n_fg_class + 1, masks=masks, captions=captions) diff --git a/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/grasp_style_server_book_picking.py b/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/grasp_style_server_book_picking.py index fe6a245fa..1f532fa8c 100644 --- a/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/grasp_style_server_book_picking.py +++ b/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/grasp_style_server_book_picking.py @@ -49,6 +49,7 @@ def _get_grasp_style(self, req): res.success = True return res + if __name__ == "__main__": rospy.init_node('grasp_style_server') server = GraspStyleServer() diff --git a/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/work_order_publisher_book_picking.py b/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/work_order_publisher_book_picking.py index 78f28a3c3..fd290e0de 100644 --- a/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/work_order_publisher_book_picking.py +++ b/demos/grasp_prediction_arc2017/ros/grasp_prediction_arc2017/nodes/work_order_publisher_book_picking.py @@ -119,6 +119,7 @@ def _publish_msg(self, event): self.larm_pub.publish(self.larm_msg) self.rarm_pub.publish(self.rarm_msg) + if __name__ == '__main__': rospy.init_node('work_order_publisher') work_order_publisher = WorkOrderPublisher()