update for noetic

PR2 · Jul 10, 2021 · 9ddbe4a · 9ddbe4a
1 parent 1bea0bd
commit 9ddbe4a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/app_notifier/package.xml b/app_notifier/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_notifier</name>
   <version>0.0.0</version>
   <description>The app_notifier package</description>
@@ -8,7 +8,8 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <exec_depend>actionlib</exec_depend>
   <exec_depend>app_manager</exec_depend>
   <exec_depend>rostwitter</exec_depend>

diff --git a/app_recorder/package.xml b/app_recorder/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_recorder</name>
   <version>0.0.0</version>
   <description>The app_recorder package</description>
@@ -8,7 +8,8 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <exec_depend>app_manager</exec_depend>
   <exec_depend>audio_play</exec_depend>
   <exec_depend>image_view</exec_depend>

diff --git a/app_scheduler/package.xml b/app_scheduler/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_scheduler</name>
   <version>0.0.0</version>
   <description>The scheduler for app_manager package</description>
@@ -8,8 +8,11 @@
   <license>BSD</license>
 
   <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>
   <exec_depend>app_manager</exec_depend>
-  <exec_depend>python-schedule</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-schedule</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-schedule</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
   <export>

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

diff --git a/app_uploader/package.xml b/app_uploader/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_uploader</name>
   <version>0.0.0</version>
   <description>The app_uploader package</description>
@@ -8,7 +8,8 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <exec_depend>app_manager</exec_depend>
   <exec_depend>gdrive_ros</exec_depend>