Prepare for python3/noetic

tue-robotics · Feb 22, 2021 · 27df532 · 27df532
1 parent d2db72a
commit 27df532
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(hero_bringup)
 
 find_package(catkin REQUIRED)

diff --git a/package.xml b/package.xml
@@ -18,8 +18,10 @@
   <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>hero_bridge</exec_depend>
   <exec_depend>hsrb_description</exec_depend>
-  <exec_depend>python-rospkg</exec_depend>
-  <exec_depend>python-yaml</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</exec_depend>
   <exec_depend>robot_launch_files</exec_depend>
   <exec_depend>rospy</exec_depend>
 

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(