Skip to content

Commit

Permalink
Fix dependencies, update CI (AprilRobotics#88)
Browse files Browse the repository at this point in the history
* package.xml: Upgrade to v3, add numpy dependency

* [CI] Add noetic, foxy; turn on PRERELEASE by default; upgrade Industrial-CI to master

* [CI] Skip testing

* package.xml: Do not install python2-numpy by default
  • Loading branch information
wxmerkt authored Jun 17, 2020
1 parent 41cfb50 commit ab14421
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@
sudo: required
language: generic
env:
global:
- CATKIN_SKIP_TESTING=1
- PRERELEASE=1
matrix:
- ROS_DISTRO="kinetic"
- ROS_DISTRO="melodic"
- ROS_DISTRO="noetic"
- ROS_DISTRO="foxy"
install:
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b master
script:
- source .ci_config/travis.sh
7 changes: 5 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<package format="3">
<name>apriltag</name>
<version>3.1.2</version>
<description>AprilTag detector library</description>

<maintainer email="[email protected]">Max Krogius</maintainer>
<maintainer email="w.merkt+oss@gmail.com">Wolfgang Merkt</maintainer>
<maintainer email="opensource@wolfgangmerkt.com">Wolfgang Merkt</maintainer>

<author email="[email protected]">Edwin Olson</author>
<author email="[email protected]">Max Krogius</author>
Expand All @@ -15,6 +15,9 @@
<url>https://april.eecs.umich.edu/software/apriltag.html</url>

<buildtool_depend>cmake</buildtool_depend>
<!-- Do not install numpy for Python2, so it won't build a Python3 wrapper when Python2 is ROS-default -->
<!--<build_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</build_depend>-->
<build_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</build_depend>

<export>
<build_type>cmake</build_type>
Expand Down

0 comments on commit ab14421

Please sign in to comment.