Merge branch 'master' into app-manager-utils

jsk-ros-pkg · Mar 23, 2023 · 3ec9244 · 3ec9244
2 parents 67e8948 + 8d6ff58
commit 3ec9244
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
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