[ros-o] sound_classification: use Python3 and requirements.in.obase

k-okada · k-okada · commit 335addd77aab · 2024-12-27T01:11:17.000Z
diff --git a/sound_classification/CMakeLists.txt b/sound_classification/CMakeLists.txt
@@ -29,10 +29,19 @@ catkin_package(
   message_runtime
   )
 
+if("$ENV{ROS_DISTRO}" STREQUAL "indigo" OR "$ENV{ROS_DISTRO}" STREQUAL "kinetic" OR
+    "$ENV{ROS_DISTRO}" STREQUAL "melodic" OR "$ENV{ROS_DISTRO}" STREQUAL "noetic")
 catkin_generate_virtualenv(
   PYTHON_INTERPRETER python2
   INPUT_REQUIREMENTS requirements.in
   )
+else()
+execute_process(COMMAND cmake -E remove ${PROJECT_SOURCE_DIR}/requirements.txt)
+catkin_generate_virtualenv(
+  PYTHON_INTERPRETER python3
+  INPUT_REQUIREMENTS requirements.in.obase
+  )
+endif()
 
 file(GLOB SCRIPTS_FILES scripts/*.py)
 catkin_install_python(
diff --git a/sound_classification/requirements.in.obase b/sound_classification/requirements.in.obase
@@ -0,0 +1,3 @@
+chainer # For Python 2.x, chainer 5.x.x is needed, 7.0.0 will not work on Python2
+numpy<2.0
+cv_bridge

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+chainer # For Python 2.x, chainer 5.x.x is needed, 7.0.0 will not work on Python2`
	`2`	`+numpy<2.0`
	`3`	`+cv_bridge`