Merge pull request #12 from ipab-slmc/wxm-noetic

Update to v2.5.0, add ROS Noetic (20.04) compatibility

.travis.yml

@@ -1,29 +1,25 @@
 # This config file for Travis CI utilizes ros-industrial/industrial_ci package.
 # For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
 sudo: required 
-dist: trusty 
+dist: bionic
 services:
   - docker
 language: generic 
-compiler:
-  - gcc
 env:
   matrix:
-    - ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true
-    - ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true
-    - ROS_DISTRO="indigo" PRERELEASE=true
-    - ROS_DISTRO="kinetic"  ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_INSTALL=true
-    - ROS_DISTRO="kinetic"  ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu NOT_TEST_INSTALL=true
-    - ROS_DISTRO="kinetic"  PRERELEASE=true
-    - ROS_DISTRO="melodic"  ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_INSTALL=true
-    - ROS_DISTRO="melodic"  ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu NOT_TEST_INSTALL=true
-    - ROS_DISTRO="melodic"  PRERELEASE=true
+    - ROS_DISTRO="kinetic"
+    - ROS_DISTRO="kinetic" PRERELEASE=true
+    - ROS_DISTRO="melodic"
+    - ROS_DISTRO="melodic" PRERELEASE=true
+    - ROS_DISTRO="noetic"
+    - ROS_DISTRO="noetic" PRERELEASE=true
 matrix:
   allow_failures:
-    - env: ROS_DISTRO="indigo" PRERELEASE=true  # Run docker-based ROS prerelease test http://wiki.ros.org/bloom/Tutorials/PrereleaseTest Because we might not want to run prerelease test for all PRs, it's omitted from pass-fail criteria.
-    - env: ROS_DISTRO="kinetic"  PRERELEASE=true
-    - env: ROS_DISTRO="melodic"  PRERELEASE=true
+    # Run docker-based ROS prerelease test http://wiki.ros.org/bloom/Tutorials/PrereleaseTest Because we might not want to run prerelease test for all PRs, it's omitted from pass-fail criteria.
+    - env: ROS_DISTRO="kinetic" PRERELEASE=true
+    - env: ROS_DISTRO="melodic" PRERELEASE=true
+    - env: ROS_DISTRO="noetic" PRERELEASE=true
 install:
-  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -b master
 script:
   - source .ci_config/travis.sh

CMakeLists.txt

@@ -5,7 +5,7 @@ find_package(catkin REQUIRED)
 include(ExternalProject)
 
 ExternalProject_Add(pybind11_src
-  URL "https://github.com/pybind/pybind11/archive/v2.4.3.zip"
+  URL "https://github.com/pybind/pybind11/archive/v2.5.0.zip"
   UPDATE_COMMAND ""
   CMAKE_ARGS -DPYBIND11_PYTHON_VERSION=${PYTHON_VERSION_STRING}
              -DPYBIND11_TEST:BOOL=OFF -DPYBIND11_INSTALL:BOOL=ON

package.xml

@@ -1,15 +1,18 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>pybind11_catkin</name>
-  <version>2.4.3</version>
+  <version>2.5.0</version>
   <description>The pybind11 package</description>
+  <maintainer email="[email protected]">Wolfgang Merkt</maintainer>
   <maintainer email="[email protected]">Vladimir Ivan</maintainer>
-  <maintainer email="[email protected]">Wolfgang Merkt</maintainer>
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_export_depend>python</build_export_depend>
-  <build_export_depend>python-numpy</build_export_depend>
   <build_export_depend>eigen</build_export_depend>
+
+  <build_export_depend condition="$ROS_PYTHON_VERSION == 2">python</build_export_depend>
+  <build_export_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</build_export_depend>
+  <build_export_depend condition="$ROS_PYTHON_VERSION == 3">python3</build_export_depend>
+  <build_export_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</build_export_depend>
 </package>