From 13000c06e23db0f763b5bc64766315c4d2c2a637 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Mon, 20 Mar 2023 18:06:00 +0900 Subject: [PATCH 1/5] install scipy to avoid numpy attribute error --- jsk_rosbag_tools/requirements.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jsk_rosbag_tools/requirements.in b/jsk_rosbag_tools/requirements.in index f7b02cd95..b27d67343 100644 --- a/jsk_rosbag_tools/requirements.in +++ b/jsk_rosbag_tools/requirements.in @@ -1 +1,3 @@ moviepy==1.0.3 +scipy +numpy From e896cc12a35a503b41e4ad7fb7bffb6ed4dbc107 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Mon, 20 Mar 2023 22:59:53 +0900 Subject: [PATCH 2/5] set scipy<1.9.0 to avoid build error with openblas https://github.com/scipy/scipy/issues/16308 --- jsk_rosbag_tools/requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsk_rosbag_tools/requirements.in b/jsk_rosbag_tools/requirements.in index b27d67343..13a15a5ce 100644 --- a/jsk_rosbag_tools/requirements.in +++ b/jsk_rosbag_tools/requirements.in @@ -1,3 +1,3 @@ moviepy==1.0.3 -scipy +scipy<1.9.0 numpy From 2de671b76146d9b58071973d39011561248c1e8b Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Wed, 22 Mar 2023 22:57:36 +0900 Subject: [PATCH 3/5] split requirements.in for python2 and 3 --- jsk_rosbag_tools/CMakeLists.txt | 2 +- jsk_rosbag_tools/requirements.in | 1 - jsk_rosbag_tools/requirements.in.python2 | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 jsk_rosbag_tools/requirements.in.python2 diff --git a/jsk_rosbag_tools/CMakeLists.txt b/jsk_rosbag_tools/CMakeLists.txt index 307da0895..7fbe9ec46 100644 --- a/jsk_rosbag_tools/CMakeLists.txt +++ b/jsk_rosbag_tools/CMakeLists.txt @@ -25,7 +25,7 @@ if($ENV{ROS_DISTRO} STREQUAL "noetic") ) else() catkin_generate_virtualenv( - INPUT_REQUIREMENTS requirements.in + INPUT_REQUIREMENTS requirements.in.python2 ) endif() diff --git a/jsk_rosbag_tools/requirements.in b/jsk_rosbag_tools/requirements.in index 13a15a5ce..5eb9df905 100644 --- a/jsk_rosbag_tools/requirements.in +++ b/jsk_rosbag_tools/requirements.in @@ -1,3 +1,2 @@ moviepy==1.0.3 scipy<1.9.0 -numpy diff --git a/jsk_rosbag_tools/requirements.in.python2 b/jsk_rosbag_tools/requirements.in.python2 new file mode 100644 index 000000000..d2aad87ec --- /dev/null +++ b/jsk_rosbag_tools/requirements.in.python2 @@ -0,0 +1,2 @@ +moviepy==1.0.3 +numpy<1.21.0 From 84c3198d8be053f0b9eb6612d01d28715054516e Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Wed, 22 Mar 2023 23:15:48 +0900 Subject: [PATCH 4/5] set numpy version for python3 --- jsk_rosbag_tools/requirements.in | 1 + 1 file changed, 1 insertion(+) diff --git a/jsk_rosbag_tools/requirements.in b/jsk_rosbag_tools/requirements.in index 5eb9df905..da50244a5 100644 --- a/jsk_rosbag_tools/requirements.in +++ b/jsk_rosbag_tools/requirements.in @@ -1,2 +1,3 @@ moviepy==1.0.3 scipy<1.9.0 +numpy>=1.21.0 From b3745f506d1f3c509ff0f46c3451a096236507bc Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Mon, 20 Mar 2023 16:50:51 +0900 Subject: [PATCH 5/5] set python2 for jsk_rosbag_tools --- jsk_rosbag_tools/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/jsk_rosbag_tools/CMakeLists.txt b/jsk_rosbag_tools/CMakeLists.txt index 7fbe9ec46..75647f879 100644 --- a/jsk_rosbag_tools/CMakeLists.txt +++ b/jsk_rosbag_tools/CMakeLists.txt @@ -26,6 +26,7 @@ if($ENV{ROS_DISTRO} STREQUAL "noetic") else() catkin_generate_virtualenv( INPUT_REQUIREMENTS requirements.in.python2 + PYTHON_INTERPRETER python2 ) endif()