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 #1025

Merged
merged 1 commit into from
Aug 13, 2019
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 17 additions & 11 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?xml version="1.0"?>
<package format="2">
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>catkin</name>
<version>0.7.18</version>
<description>Low-level build system macros and infrastructure for ROS.</description>
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>

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

Expand All @@ -15,21 +18,24 @@
<author>Brian Gerkey</author>
<author>Dirk Thomas</author>

<depend condition="$ROS_PYTHON_VERSION == 2">python-argparse</depend>
<depend condition="$ROS_PYTHON_VERSION == 2" version_gt="0.4.3">python-catkin-pkg</depend>
<depend condition="$ROS_PYTHON_VERSION == 3" version_gt="0.4.3">python3-catkin-pkg</depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-empy</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-empy</depend>
sloretz marked this conversation as resolved.
Show resolved Hide resolved

<buildtool_depend>cmake</buildtool_depend>
<buildtool_export_depend>cmake</buildtool_export_depend>

<depend>python-argparse</depend>
<depend version_gt="0.4.3">python-catkin-pkg</depend>

<build_depend>python-empy</build_depend>

<build_export_depend>google-mock</build_export_depend>
<build_export_depend>gtest</build_export_depend>
<build_export_depend>python-empy</build_export_depend>
<build_export_depend>python-nose</build_export_depend>
<build_export_depend condition="$ROS_PYTHON_VERSION == 2">python-nose</build_export_depend>
<build_export_depend condition="$ROS_PYTHON_VERSION == 3">python3-nose</build_export_depend>

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

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