Merge pull request #1058 from jcarpent/devel

Fix bug for Python3

.travis.yml

@@ -31,17 +31,25 @@ branches:
 jobs:
   include:
     - dist: xenial
-      env: BUILD_WITH_COLLISION_SUPPORT=OFF
-      python: "2.7"
+      env: 
+        - BUILD_WITH_COLLISION_SUPPORT=OFF
+        - TRAVIS_PYTHON_VERSION=27
+      python: 2.7
     - dist: trusty 
-      env: BUILD_WITH_COLLISION_SUPPORT=ON
-      python: "2.7"
+      env: 
+        - BUILD_WITH_COLLISION_SUPPORT=ON
+        - TRAVIS_PYTHON_VERSION=27
+      python: 2.7
     - dist: xenial
-      env: BUILD_WITH_COLLISION_SUPPORT=ON
-      python: "2.7"
+      env: 
+        - BUILD_WITH_COLLISION_SUPPORT=ON
+        - TRAVIS_PYTHON_VERSION=27
+      python: 2.7
     - dist: xenial
-      env: BUILD_WITH_COLLISION_SUPPORT=ON
-      python: "3.5"
+      env: 
+        - BUILD_WITH_COLLISION_SUPPORT=ON
+        - TRAVIS_PYTHON_VERSION=35
+      python: 3.5
 
 allow_failures:
   - compiler:

bindings/python/pinocchio/utils.py

@@ -10,7 +10,7 @@ import numpy as np
 import numpy.linalg as npl
 
 from . import libpinocchio_pywrap as pin
-from libpinocchio_pywrap.rpy import matrixToRpy, rpyToMatrix, rotate
+from .libpinocchio_pywrap.rpy import matrixToRpy, rpyToMatrix, rotate
 
 from .deprecation import deprecated
 

travis_custom/custom_before_install

@@ -14,8 +14,14 @@ sudo free -m -t
 
 # Setup environment variables.
 export APT_DEPENDENCIES="doxygen libboost-system-dev libboost-test-dev libboost-filesystem-dev libboost-program-options-dev libeigen3-dev liburdfdom-dev texlive-font-utils"
+
 # Add Python dependency
-export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-py27-eigenpy python2.7-dev python-numpy"
+echo "TRAVIS_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION"
+if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
+  export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-py35-eigenpy python3.5-dev python-numpy"
+else
+  export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-py27-eigenpy python2.7-dev python-numpy"
+fi
 
 # Add Geometry dependencies
 if [[ $BUILD_WITH_COLLISION_SUPPORT -eq ON ]]; then 

travis_custom/custom_build

@@ -6,7 +6,7 @@ set -x
 set -v
 
 # Setup environment variables.
-if [[ $TRAVIS_PYTHON_VERSION -gt 3 ]]; then
+if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
   export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DPYTHON_EXECUTABLE=$(which python3)"
 else
   export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DPYTHON_EXECUTABLE=$(which python2)"