From 42d1d85a44a803823b6b69e047c8a0099fbbcfc9 Mon Sep 17 00:00:00 2001 From: Arne Hitzmann Date: Sat, 4 Mar 2023 14:26:00 +0900 Subject: [PATCH 1/2] updated package.xml to format version 3 --- pr2_camera_synchronizer/package.xml | 12 ++++++------ pr2_computer_monitor/package.xml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pr2_camera_synchronizer/package.xml b/pr2_camera_synchronizer/package.xml index 0319388..c82617f 100644 --- a/pr2_camera_synchronizer/package.xml +++ b/pr2_camera_synchronizer/package.xml @@ -1,4 +1,4 @@ - + pr2_camera_synchronizer 1.6.32 @@ -30,9 +30,9 @@ dynamic_reconfigure rostest - ethercat_trigger_controllers - rospy - dynamic_reconfigure - wge100_camera - diagnostic_msgs + ethercat_trigger_controllers + rospy + dynamic_reconfigure + wge100_camera + diagnostic_msgs diff --git a/pr2_computer_monitor/package.xml b/pr2_computer_monitor/package.xml index 2146f07..0f85377 100644 --- a/pr2_computer_monitor/package.xml +++ b/pr2_computer_monitor/package.xml @@ -1,4 +1,4 @@ - + pr2_computer_monitor 1.6.32 Monitors the computer's processor and hard drives of the PR2 and publishes data to diagnostics. @@ -18,11 +18,11 @@ roscpp std_msgs - diagnostic_msgs - rospy - pr2_msgs - roscpp - std_msgs + diagnostic_msgs + rospy + pr2_msgs + roscpp + std_msgs From 97adbfa73a2a06d2bdc9b113c891390316fb3578 Mon Sep 17 00:00:00 2001 From: Arne Hitzmann Date: Sat, 4 Mar 2023 14:27:41 +0900 Subject: [PATCH 2/2] change to setuptools in accordance with migration guide --- pr2_camera_synchronizer/package.xml | 2 ++ pr2_camera_synchronizer/setup.py | 2 +- pr2_computer_monitor/package.xml | 2 ++ pr2_computer_monitor/setup.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pr2_camera_synchronizer/package.xml b/pr2_camera_synchronizer/package.xml index c82617f..a68bb82 100644 --- a/pr2_camera_synchronizer/package.xml +++ b/pr2_camera_synchronizer/package.xml @@ -26,6 +26,8 @@ Blaise Gassend catkin + python-setuptools + python3-setuptools dynamic_reconfigure rostest diff --git a/pr2_camera_synchronizer/setup.py b/pr2_camera_synchronizer/setup.py index 5e12d06..f1ae0e2 100644 --- a/pr2_camera_synchronizer/setup.py +++ b/pr2_camera_synchronizer/setup.py @@ -1,6 +1,6 @@ ## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml diff --git a/pr2_computer_monitor/package.xml b/pr2_computer_monitor/package.xml index 0f85377..a10827e 100644 --- a/pr2_computer_monitor/package.xml +++ b/pr2_computer_monitor/package.xml @@ -12,6 +12,8 @@ Kevin Watts (watts@willowgarage.com) catkin + python-setuptools + python3-setuptools diagnostic_msgs pr2_msgs diff --git a/pr2_computer_monitor/setup.py b/pr2_computer_monitor/setup.py index a00b195..feb8a8a 100644 --- a/pr2_computer_monitor/setup.py +++ b/pr2_computer_monitor/setup.py @@ -1,6 +1,6 @@ ## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml