Import setup from setuptools instead of distutils.core (#1239)

* updated package.xml to format version 3 * change to setuptools in accordance with migration guide
ros-planning · Mar 4, 2023 · 9ad6441 · 9ad6441
1 parent 85e5f33
commit 9ad6441
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/base_local_planner/package.xml b/base_local_planner/package.xml
@@ -1,6 +1,6 @@
 <?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>base_local_planner</name>
     <version>1.17.3</version>
     <description>
@@ -18,6 +18,8 @@
     <url>http://wiki.ros.org/base_local_planner</url>
 
     <buildtool_depend version_gte="0.5.68">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>cmake_modules</build_depend>
     <build_depend>message_generation</build_depend>

diff --git a/base_local_planner/setup.py b/base_local_planner/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from distutils.core import setup
+from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(