Merge pull request #57 from asmodehn/devel

upgrading gopher_devel

.travis.yml

@@ -36,7 +36,7 @@ install:
   # refreshing packages
   - docker exec -ti ${CONTAINER_NAME} apt-get update
   # TMP Patch because rosdep doesnt declare a dependency to sudo yet (2016-08-25) and it doesnt come with xenial
-  - docker exec -ti ${CONTAINER_NAME} apt-get install sudo
+  - docker exec -ti ${CONTAINER_NAME} apt-get install sudo -y
   - docker exec -ti ${CONTAINER_NAME} rosdep update
   # copying local clone to the running container (volume is currently broken)
   - docker cp . ${CONTAINER_NAME}:/git_clone

CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog for package catkin_pip
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.16 (2016-09-05)
+-------------------
+* now also checking for --system for pip > 6.0.0.
+* small improvements for travis checks
+* Contributors: AlexV, alexv
+
 0.1.15 (2016-09-01)
 -------------------
 * now transferring paths from pth in devel site-packages to pythonpath shell env, to handle egg-link and workspace overlaying together...

cmake/catkin-pip-prefix.cmake.in

@@ -144,15 +144,15 @@ function(catkin_pip_setup_prefix ws_prefix)
 
         message(STATUS "    ... Retrieving catkin_pip requirements using system pip ...")
 
-        if (${CATKIN_SYS_PIP_VERSION} VERSION_LESS 6.0.0)
-            if(${CATKIN_SYS_PIP_HAS_SYSTEM})
-                # if --system is present, it means the default behavior has been changed to --user (by debian/ubuntu)
-                # and we have to specify --system in order to use --target
-                set(OPT_SYSTEM "--system")
-            else(${CATKIN_SYS_PIP_HAS_SYSTEM})
-                set(OPT_SYSTEM "")
-            endif(${CATKIN_SYS_PIP_HAS_SYSTEM})
+        if(${CATKIN_SYS_PIP_HAS_SYSTEM})
+            # if --system is present, it means the default behavior has been changed to --user (by debian/ubuntu)
+            # and we have to specify --system in order to use --target
+            set(OPT_SYSTEM "--system")
+        else(${CATKIN_SYS_PIP_HAS_SYSTEM})
+            set(OPT_SYSTEM "")
+        endif(${CATKIN_SYS_PIP_HAS_SYSTEM})
 
+        if (${CATKIN_SYS_PIP_VERSION} VERSION_LESS 6.0.0)
             # We need to find a pip command that works for old pip versions (indigo supports trusty which is pip v1.5.4)
             # Note --target here means we cannot check if a package is already installed or not before installing, using old pip.
             # which means we have to reinstall dependencies everytime and specify --exists-action w to avoid "already exists" errors

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>catkin_pip</name>
-  <version>0.1.15</version>
+  <version>0.1.16</version>
   <description>
     Catkin macros to allow using pure python packages in usual catkin workspaces with normal python workflow.
   </description>

travis_checks.bash

@@ -9,7 +9,7 @@ cd $DIR
 # It is used by travis and can also be used by a developer for checking his current working tree.
 #
 # These variables need to be setup before calling this script:
-# CI_ROS_DISTRO [indigo | jade]
+# CI_ROS_DISTRO [indigo | jade | kinetic]
 # ROS_FLOW [devel | install]
 
 # For travis docker, this is already done by the entrypoint in docker image.
@@ -23,12 +23,16 @@ cmake ../test -DCMAKE_INSTALL_PREFIX=./install
 if [ "$ROS_FLOW" == "devel" ]; then
     make -j1
     source devel/setup.bash
+    echo PYTHONPATH = $PYTHONPATH
+    rospack profile
     make -j1 tests
     make -j1 run_tests
     catkin_test_results .
 elif [ "$ROS_FLOW" == "install" ]; then
     make -j1 install
     source install/setup.bash
+    echo PYTHONPATH = $PYTHONPATH
+    rospack profile
     # TMP disabling test from now, since mypippkg has no tests
     #nosetests mypippkg
     #python -m pytest --pyargs mypippkg