Skip to content

Commit

Permalink
update to use catkin_virtualenv
Browse files Browse the repository at this point in the history
As I commented on pyros-dev/catkin_pip#109 (comment), chanier_virtualenv seems better in terms of our requirement
  • Loading branch information
k-okada committed Mar 9, 2018
1 parent f06ebb6 commit 4fcb6c2
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 9 deletions.
22 changes: 16 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
cmake_minimum_required(VERSION 2.8.12)
project(chainercv)

find_package(catkin REQUIRED COMPONENTS catkin_pip)
# Make sure to find-package `catkin_virtualenv`
find_package(catkin REQUIRED catkin_virtualenv)

# defining current package as a package that should be managed by pip (not catkin - even though we make it usable with workspaces)
catkin_pip_package_virtualenv(${PROJECT_NAME})
# CAREFUL : all projects for test here will share the same workspace. pip might have conflicts...
# Must be called before catkin_generate_virtualenv
catkin_package()

# # We need to install the project pip dependencies in the devel workspace being created
# catkin_pip_requirements(${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt)
# Generate the virtualenv, optionally with python 3 as the default interpreter:
catkin_generate_virtualenv()
# catkin_generate_virtualenv(PYTHON3)

# Make sure your python executables are installed using `catkin_install_python`:
catkin_install_python(
PROGRAMS
scripts/ssd_demo.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

install(FILES requirements.txt
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
10 changes: 7 additions & 3 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
<name>chainercv</name>
<version>0.0.1</version>
<description>
ChainerCV with Catkin
ChainerCV ROS Interface
</description>
<maintainer email="asmodehn@gmail.com">AlexV</maintainer>
<maintainer email="yuyuniitani@gmail.com">Yusuke Niitani</maintainer>
<author>Yusuke Niitani</author>
<license>MIT</license>
<url type="repository">https://github.com/yuyu2172/chainercv-ros.git</url>

<buildtool_depend>catkin</buildtool_depend>
<build_depend version_gte="0.1.16">catkin_pip</build_depend>
<build_depend>catkin_virtualenv</build_depend>

<export>
<pip_requirements>requirements.txt</pip_requirements>
</export>

</package>
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chainercv>=0.8

0 comments on commit 4fcb6c2

Please sign in to comment.