change to setuptools in accordance with migration guide

PR2 · Mar 4, 2023 · 97adbfa · 97adbfa
1 parent 42d1d85
commit 97adbfa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/pr2_camera_synchronizer/package.xml b/pr2_camera_synchronizer/package.xml
@@ -26,6 +26,8 @@
   <author>Blaise Gassend</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>dynamic_reconfigure</build_depend>
   <build_depend>rostest</build_depend>

diff --git 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
@@ -12,6 +12,8 @@
   <author>Kevin Watts ([email protected])</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>diagnostic_msgs</build_depend>
   <build_depend>pr2_msgs</build_depend>

diff --git 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