Merge pull request #42 from arne48/setuptools_migration

Import setup from setuptools instead of distutils.core
PR2 · Mar 6, 2023 · 526fa72 · 526fa72
2 parents 8cff14e + 1481d38
commit 526fa72
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/joint_trajectory_action_tools/package.xml b/joint_trajectory_action_tools/package.xml
@@ -1,4 +1,4 @@
-<package>
+<package format="3">
   <name>joint_trajectory_action_tools</name>
   <version>0.0.12</version>
   <description>
@@ -16,17 +16,19 @@
   <url type="repository">https://github.com/PR2/pr2_common_actions</url>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
 
   <build_depend>roslib</build_depend>
   <build_depend>rospy</build_depend>
   <build_depend>joint_trajectory_action</build_depend>
   <build_depend>trajectory_msgs</build_depend>
   <build_depend>pr2_controllers_msgs</build_depend>
 
-  <run_depend>roslib</run_depend>
-  <run_depend>rospy</run_depend>
-  <run_depend>joint_trajectory_action</run_depend>
-  <run_depend>trajectory_msgs</run_depend>
-  <run_depend>pr2_controllers_msgs</run_depend>
+  <exec_depend>roslib</exec_depend>
+  <exec_depend>rospy</exec_depend>
+  <exec_depend>joint_trajectory_action</exec_depend>
+  <exec_depend>trajectory_msgs</exec_depend>
+  <exec_depend>pr2_controllers_msgs</exec_depend>
 
 </package>
diff --git a/pr2_tuck_arms_action/package.xml b/pr2_tuck_arms_action/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package format="3">
   <name>pr2_tuck_arms_action</name>
   <version>0.0.12</version>
   <description>The pr2_tuck_arms_action package</description>
@@ -11,6 +11,8 @@
   <author>Wim Meeussen</author> 
 
   <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
 
   <build_depend>actionlib</build_depend>
   <build_depend>actionlib_msgs</build_depend>
@@ -19,12 +21,12 @@
   <build_depend>rospy</build_depend>
   <build_depend>trajectory_msgs</build_depend>
 
-  <run_depend>actionlib</run_depend>
-  <run_depend>actionlib_msgs</run_depend>
-  <run_depend>pr2_common_action_msgs</run_depend>
-  <run_depend>pr2_controllers_msgs</run_depend>
-  <run_depend>rospy</run_depend>
-  <run_depend>trajectory_msgs</run_depend>
+  <exec_depend>actionlib</exec_depend>
+  <exec_depend>actionlib_msgs</exec_depend>
+  <exec_depend>pr2_common_action_msgs</exec_depend>
+  <exec_depend>pr2_controllers_msgs</exec_depend>
+  <exec_depend>rospy</exec_depend>
+  <exec_depend>trajectory_msgs</exec_depend>
 
 
   <export>