From 6809c0e8526972543dbf1f5430653750e3d15ec5 Mon Sep 17 00:00:00 2001
From: deadln <glebuch2000@list.ru>
Date: Wed, 12 May 2021 10:23:05 -0700
Subject: [PATCH] Implemented catkin_virtualenv into clover package

---
 clover/CMakeLists.txt   | 18 +++++++++++++-----
 clover/package.xml      |  3 +++
 clover/requirements.in  | 13 +++++++++++++
 clover/requirements.txt |  5 -----
 4 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 clover/requirements.in
 delete mode 100644 clover/requirements.txt

diff --git a/clover/CMakeLists.txt b/clover/CMakeLists.txt
index d779e5f7..eb1b39a7 100644
--- a/clover/CMakeLists.txt
+++ b/clover/CMakeLists.txt
@@ -24,6 +24,7 @@ find_package(catkin REQUIRED COMPONENTS
   tf2_ros
   image_transport
   cv_bridge
+  catkin_virtualenv
 )
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -132,6 +133,16 @@ generate_messages(
 ## LIBRARIES: libraries you create in this project that dependent projects also need
 ## CATKIN_DEPENDS: catkin_packages dependent projects also need
 ## DEPENDS: system dependencies of this project that dependent projects also need
+
+# Generate the virtualenv
+catkin_generate_virtualenv(INPUT_REQUIREMENTS requirements.in)
+
+# Make sure your python executables are installed using `catkin_install_python`:
+catkin_install_python(
+  PROGRAMS
+    src/selfcheck.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
 catkin_package(
 #  INCLUDE_DIRS include
   LIBRARIES ${PROJECT_NAME}
@@ -248,11 +259,8 @@ target_link_libraries(${PROJECT_NAME}
 # )
 
 ## Mark other files for installation (e.g. launch and bag files, etc.)
-# install(FILES
-#   # myfile1
-#   # myfile2
-#   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-# )
+ install(FILES requirements.in
+       	 DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 
 # Only install udev rules when building a Debian package
 # FIXME: Other operating systems may have other prefixes
diff --git a/clover/package.xml b/clover/package.xml
index cc4e720e..70374480 100644
--- a/clover/package.xml
+++ b/clover/package.xml
@@ -15,6 +15,7 @@
 
   <!-- Package format specifier version 2.0 allows specifying dependencies for both
    build- and runtime in a single <depend> element -->
+  <build_depend>catkin_virtualenv</build_depend>
   <depend>message_generation</depend>
   <depend>roscpp</depend>
   <depend>rospy</depend>
@@ -38,6 +39,7 @@
   <depend>web_video_server</depend>
   <depend>tf2_web_republisher</depend>
   <depend>python-lxml</depend>
+  <test_depend>ros_pytest</test_depend>
   <!-- <exec_depend>python-pymavlink</exec_depend> -->
   <!-- Use test_depend for packages you need only for testing: -->
   <!--   <test_depend>gtest</test_depend> -->
@@ -46,5 +48,6 @@
   <export>
     <nodelet plugin="${prefix}/nodelet_plugins.xml" />
     <!-- Other tools can request additional information be placed here -->
+    <pip_requirements>requirements.in</pip_requirements>
   </export>
 </package>
diff --git a/clover/requirements.in b/clover/requirements.in
new file mode 100644
index 00000000..5a19b343
--- /dev/null
+++ b/clover/requirements.in
@@ -0,0 +1,13 @@
+click>=7.1.2
+docopt>=0.6.2
+flask>=1.1.1
+future>=0.18.2
+geopy>=1.11.0
+itsdangerous>=1.1.0
+jinja2>=2.11.3
+lxml>=4.6.3
+markupsafe>=1.1.1
+pymavlink>=2.4.14
+smbus2>=0.3.0
+vl53l1x>=0.0.5
+werkzeug>=1.0.1
diff --git a/clover/requirements.txt b/clover/requirements.txt
deleted file mode 100644
index 81d0fda6..00000000
--- a/clover/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-flask==1.1.1
-docopt==0.6.2
-geopy==1.11.0
-smbus2==0.3.0
-VL53L1X==0.0.5