[switchbot_ros]force to use python3 for lambda string sort

jsk-ros-pkg · Oct 23, 2023 · f925bc2 · f925bc2
1 parent 2c04a08
commit f925bc2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/switchbot_ros/CMakeLists.txt b/switchbot_ros/CMakeLists.txt
@@ -5,6 +5,7 @@ find_package(
   catkin REQUIRED COMPONENTS
   message_generation
   actionlib_msgs
+  catkin_virtualenv
 )
 
 catkin_python_setup()
@@ -27,6 +28,11 @@ generate_messages(
 
 catkin_package()
 
+catkin_generate_virtualenv(
+  PYTHON_INTERPRETER python3
+  CHECK_VENV FALSE
+)
+
 include_directories()
 
 # install

diff --git a/switchbot_ros/package.xml b/switchbot_ros/package.xml
@@ -11,15 +11,14 @@
   <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>
+  <buildtool_depend>python3-setuptools</buildtool_depend>
 
   <build_depend>actionlib</build_depend>
   <build_depend>actionlib_msgs</build_depend>
+  <build_depend>catkin_virtualenv</build_depend>
   <build_depend>message_generation</build_depend>
 
-  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-requests</exec_depend>
-  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-requests</exec_depend>
+  <exec_depend>python3-requests</exec_depend>
   <exec_depend>actionlib</exec_depend>
   <exec_depend>actionlib_msgs</exec_depend>
   <exec_depend>message_runtime</exec_depend>

diff --git a/switchbot_ros/scripts/switchbot_ros_server.py b/switchbot_ros/scripts/switchbot_ros_server.py