Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use condition attributes to specify Python 2 and 3 dependencies #1792

Merged
merged 2 commits into from
Aug 15, 2019
Merged

use condition attributes to specify Python 2 and 3 dependencies #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc2e5c4
use condition attributes to specify Python 2 and 3 dependencies
dirk-thomas Aug 13, 2019
bd2dcba
use python3-pil
dirk-thomas Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions clients/rospy/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rospy</name>
<version>1.14.3</version>
<description>
Expand All @@ -22,20 +26,26 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/rospy</url>
<url type="website">http://wiki.ros.org/rospy</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>

<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<run_depend>genpy</run_depend>
<run_depend>python-numpy</run_depend>
<run_depend>python-rospkg</run_depend>
<run_depend>python-yaml</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>rosgraph</run_depend>
<run_depend version_gte="1.10.3">rosgraph_msgs</run_depend>
<run_depend>roslib</run_depend>
<run_depend>std_msgs</run_depend>
<exec_depend>genpy</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</exec_depend>
<exec_depend>roscpp</exec_depend>
<exec_depend>rosgraph</exec_depend>
<exec_depend version_gte="1.10.3">rosgraph_msgs</exec_depend>
<exec_depend>roslib</exec_depend>
<exec_depend>std_msgs</exec_depend>

<export>
<rosdoc config="rosdoc.yaml"/>
Expand Down
23 changes: 15 additions & 8 deletions test/test_rosbag/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>test_rosbag</name>
<version>1.14.3</version>
<description>
Expand All @@ -7,36 +11,39 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/rosbag</url>
<url type="website">http://wiki.ros.org/rosbag</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Tim Field</author>
<author>Jeremy Leibs</author>
<author>James Bowman</author>

<depend>rosbag</depend>
<depend>rostest</depend>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>

<build_depend>boost</build_depend>
<build_depend>bzip2</build_depend>
<build_depend>cpp_common</build_depend>
<build_depend>message_generation</build_depend>
<build_depend>python-imaging</build_depend>
<build_depend>rosbag</build_depend>
<build_depend condition="$ROS_PYTHON_VERSION == 2">python-imaging</build_depend>
<build_depend condition="$ROS_PYTHON_VERSION == 3">python3-pil</build_depend>
<build_depend>rosconsole</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>roscpp_serialization</build_depend>
<build_depend>rosgraph_msgs</build_depend>
<build_depend>rostest</build_depend>
<build_depend>rosunit</build_depend>
<build_depend>topic_tools</build_depend>
<build_depend>xmlrpcpp</build_depend>

<test_depend>genmsg</test_depend>
<test_depend>genpy</test_depend>
<test_depend>message_runtime</test_depend>
<test_depend>python-rospkg</test_depend>
<test_depend>rosbag</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</test_depend>
<test_depend>roslib</test_depend>
<test_depend>rospy</test_depend>
<test_depend>rostest</test_depend>
<test_depend>rostopic</test_depend>

<export>
Expand Down
13 changes: 10 additions & 3 deletions test/test_roslaunch/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>test_roslaunch</name>
<version>1.14.3</version>
<description>
Expand All @@ -7,14 +11,17 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/roslaunch</url>
<url type="website">http://wiki.ros.org/roslaunch</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>

<build_depend>rostest</build_depend>

<test_depend>python-rospkg</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</test_depend>
<test_depend>rosgraph</test_depend>
<test_depend>roslaunch</test_depend>
</package>
13 changes: 10 additions & 3 deletions test/test_rosparam/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>test_rosparam</name>
<version>1.14.3</version>
<description>
Expand All @@ -7,14 +11,17 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/rosparam</url>
<url type="website">http://wiki.ros.org/rosparam</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>

<build_depend>rostest</build_depend>

<test_depend>python-yaml</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</test_depend>
<test_depend>rosgraph</test_depend>
<test_depend>rosparam</test_depend>

Expand Down
16 changes: 12 additions & 4 deletions test/test_rospy/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>test_rospy</name>
<version>1.14.3</version>
<description>
Expand All @@ -7,7 +11,9 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/rospy</url>
<url type="website">http://wiki.ros.org/rospy</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
Expand All @@ -17,8 +23,10 @@
<build_depend>std_msgs</build_depend>
<build_depend>test_rosmaster</build_depend>

<test_depend>python-numpy</test_depend>
<test_depend>python-psutil</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 2">python-psutil</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-psutil</test_depend>
<test_depend>rosbuild</test_depend>
<test_depend>rosgraph</test_depend>
<test_depend>rospy</test_depend>
Expand Down
51 changes: 28 additions & 23 deletions tools/rosbag/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rosbag</name>
<version>1.14.3</version>
<description>
Expand All @@ -9,38 +13,39 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/rosbag</url>
<url type="website">http://wiki.ros.org/rosbag</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Tim Field</author>
<author>Jeremy Leibs</author>
<author>James Bowman</author>

<depend>boost</depend>
<depend>rosbag_storage</depend>
<depend>rosconsole</depend>
<depend>roscpp</depend>
<depend>std_srvs</depend>
<depend>xmlrpcpp</depend>

<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<build_depend>boost</build_depend>
<build_depend>cpp_common</build_depend>
<build_depend>python-imaging</build_depend>
<build_depend>rosbag_storage</build_depend>
<build_depend>rosconsole</build_depend>
<build_depend>roscpp</build_depend>
<build_depend condition="$ROS_PYTHON_VERSION == 2">python-imaging</build_depend>
<build_depend condition="$ROS_PYTHON_VERSION == 3">python3-pil</build_depend>
<build_depend>roscpp_serialization</build_depend>
<build_depend>std_srvs</build_depend>
<build_depend>topic_tools</build_depend>
<build_depend>xmlrpcpp</build_depend>

<run_depend>boost</run_depend>
<run_depend>genmsg</run_depend>
<run_depend>genpy</run_depend>
<run_depend>python-pycryptodome</run_depend>
<run_depend>python-gnupg</run_depend>
<run_depend>python-rospkg</run_depend>
<run_depend>rosbag_storage</run_depend>
<run_depend>rosconsole</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>roslib</run_depend>
<run_depend>rospy</run_depend>
<run_depend>std_srvs</run_depend>
<run_depend>topic_tools</run_depend>
<run_depend>xmlrpcpp</run_depend>
<exec_depend>genmsg</exec_depend>
<exec_depend>genpy</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-pycryptodome</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-pycryptodome</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-gnupg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-gnupg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
<exec_depend>roslib</exec_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>topic_tools</exec_depend>

<export>
<rosdoc config="${prefix}/rosdoc.yaml"/>
Expand Down
24 changes: 17 additions & 7 deletions tools/rosgraph/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<package>
<name>rosgraph</name>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rosgraph</name>
<version>1.14.3</version>
<description>
rosgraph contains the rosgraph command-line tool, which prints
Expand All @@ -9,16 +13,22 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/rosgraph</url>
<url type="website">http://wiki.ros.org/rosgraph</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<run_depend>python-netifaces</run_depend>
<run_depend>python-rospkg</run_depend>
<run_depend>python-yaml</run_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-netifaces</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-netifaces</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</exec_depend>

<test_depend>python-mock</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 2">python-mock</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-mock</test_depend>

<export>
<rosdoc config="rosdoc.yaml"/>
Expand Down
33 changes: 21 additions & 12 deletions tools/roslaunch/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>roslaunch</name>
<version>1.14.3</version>
<description>
Expand All @@ -15,21 +19,26 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/roslaunch</url>
<url type="website">http://wiki.ros.org/roslaunch</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>

<run_depend>python-paramiko</run_depend>
<run_depend version_gte="1.0.37">python-rospkg</run_depend>
<run_depend>python-yaml</run_depend>
<run_depend>rosclean</run_depend>
<run_depend>rosgraph_msgs</run_depend>
<run_depend>roslib</run_depend>
<run_depend version_gte="1.11.16">rosmaster</run_depend>
<run_depend>rosout</run_depend>
<run_depend>rosparam</run_depend>
<run_depend version_gte="1.13.3">rosunit</run_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-paramiko</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-paramiko</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2" version_gte="1.0.37">python-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3" version_gte="1.0.37">python3-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</exec_depend>
<exec_depend>rosclean</exec_depend>
<exec_depend>rosgraph_msgs</exec_depend>
<exec_depend>roslib</exec_depend>
<exec_depend version_gte="1.11.16">rosmaster</exec_depend>
<exec_depend>rosout</exec_depend>
<exec_depend>rosparam</exec_depend>
<exec_depend version_gte="1.13.3">rosunit</exec_depend>

<test_depend>rosbuild</test_depend>

Expand Down
15 changes: 11 additions & 4 deletions tools/rosmaster/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package>
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rosmaster</name>
<version>1.14.3</version>
<description>
Expand All @@ -7,13 +11,16 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

<url>http://ros.org/wiki/rosmaster</url>
<url type="website">http://wiki.ros.org/rosmaster</url>
<url type="bugtracker">https://github.com/ros/ros_comm/issues</url>
<url type="repository">https://github.com/ros/ros_comm</url>
<author>Ken Conley</author>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>

<run_depend>rosgraph</run_depend>
<run_depend>python-defusedxml</run_depend>
<exec_depend>rosgraph</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-defusedxml</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-defusedxml</exec_depend>

<export>
<rosdoc config="rosdoc.yaml"/>
Expand Down
Loading