Skip to content

Commit 7816812

Browse files
committed
Revert "add condition="$ROS_DISTRO != debian" for ROS-O to skip pip install"
This reverts commit b05b86e.
1 parent b05b86e commit 7816812

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

jsk_perception/package.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@
8484
<!-- install chainer {{ -->
8585
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-h5py</exec_depend>
8686
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-h5py</exec_depend>
87-
<exec_depend version_lt="7.0.0" condition="$ROS_DISTRO != debian">python-chainer-pip</exec_depend>
87+
<exec_depend version_lt="7.0.0">python-chainer-pip</exec_depend>
8888
<!-- python-cahiner-pip depends: [cython, python-numpy] in rosdep/python.yaml, which is not installable on python3 environment -->
8989
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-chainercv-pip</exec_depend>
9090
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-chainer-mask-rcnn-pip</exec_depend>
9191
<!-- }} install chainer -->
92-
<exec_depend condition="$ROS_DISTRO != debian">python-dlib</exec_depend> <!-- pip -->
92+
<exec_depend>python-dlib</exec_depend> <!-- pip -->
9393
<!-- install fcn {{ -->
9494
<exec_depend>leveldb</exec_depend>
95-
<exec_depend condition="$ROS_DISTRO != debian">python-fcn-pip</exec_depend> <!-- pip -->
95+
<exec_depend>python-fcn-pip</exec_depend> <!-- pip -->
9696
<!-- }} install fcn -->
97-
<exec_depend version_lt="0.3.7" condition="$ROS_DISTRO != debian">python-pytesseract-pip</exec_depend>
97+
<exec_depend version_lt="0.3.7">python-pytesseract-pip</exec_depend>
9898
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-requests</exec_depend>
9999
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-requests</exec_depend>
100100
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-sklearn</exec_depend>

0 commit comments

Comments
 (0)