Merge branch 'master' into app-manager-utils

knorth55 · web-flow · commit 3ec9244d48de · 2023-03-23T10:56:57.000+09:00
diff --git a/jsk_rosbag_tools/CMakeLists.txt b/jsk_rosbag_tools/CMakeLists.txt
@@ -25,7 +25,8 @@ if($ENV{ROS_DISTRO} STREQUAL "noetic")
   )
 else()
   catkin_generate_virtualenv(
-    INPUT_REQUIREMENTS requirements.in
+    INPUT_REQUIREMENTS requirements.in.python2
+    PYTHON_INTERPRETER python2
   )
 endif()
 
diff --git a/jsk_rosbag_tools/requirements.in b/jsk_rosbag_tools/requirements.in
@@ -1 +1,3 @@
 moviepy==1.0.3
+scipy<1.9.0
+numpy>=1.21.0
diff --git a/jsk_rosbag_tools/requirements.in.python2 b/jsk_rosbag_tools/requirements.in.python2
@@ -0,0 +1,2 @@
+moviepy==1.0.3
+numpy<1.21.0

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ if($ENV{ROS_DISTRO} STREQUAL "noetic")`
`25`	`25`	`)`
`26`	`26`	`else()`
`27`	`27`	`catkin_generate_virtualenv(`
`28`		`- INPUT_REQUIREMENTS requirements.in`
	`28`	`+ INPUT_REQUIREMENTS requirements.in.python2`
	`29`	`+ PYTHON_INTERPRETER python2`
`29`	`30`	`)`
`30`	`31`	`endif()`
`31`	`32`