Use setuptools instead of distutils (#61)

Signed-off-by: ahcorde <ahcorde@gmail.com>
ros · Mar 27, 2020 · 6413983 · 6413983
1 parent 47f1798
commit 6413983
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/bondpy/package.xml b/bondpy/package.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
-<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
-<package format="2">
+<?xml-model
+  href="http://download.ros.org/schema/package_format3.xsd"
+  schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>bondpy</name>
   <version>1.8.4</version>
   <description>
@@ -25,6 +27,9 @@
   <exec_depend>smclib</exec_depend>
   <exec_depend>uuid</exec_depend>
 
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
+
   <export>
     <architecture_independent/>
   </export>

diff --git a/bondpy/setup.py b/bondpy/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 
 from catkin_pkg.python_setup import generate_distutils_setup
 

diff --git a/smclib/package.xml b/smclib/package.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
-<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
-<package format="2">
+<?xml-model
+  href="http://download.ros.org/schema/package_format3.xsd"
+  schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>smclib</name>
   <version>1.8.4</version>
   <description>
@@ -20,6 +22,8 @@
   <author>Various</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>
 
   <export>
     <architecture_independent/>

diff --git a/smclib/setup.py b/smclib/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 
 from catkin_pkg.python_setup import generate_distutils_setup