diff --git a/.gitmodules b/.gitmodules
index 9556256b911d782db4b2ee2fdc46b84f8e6fb3dc..2b7a4fe10be4def3b75624e91852ee7add08eaa2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "cmake"]
path = cmake
url = https://github.com/jrl-umi3218/jrl-cmakemodules.git
-[submodule ".travis"]
- path = .travis
- url = https://github.com/jrl-umi3218/jrl-travis.git
diff --git a/.travis b/.travis
deleted file mode 160000
index 0f12f18e62a504278ef31f0118f1da48607a524e..0000000000000000000000000000000000000000
--- a/.travis
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f12f18e62a504278ef31f0118f1da48607a524e
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a9638f6e59303e987b0b18592d5224f0c85a684b..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-language: cpp
-git:
- depth: false
-compiler:
- - gcc
-# - clang
-env:
- global:
- - secure: "SnIBG/xLIHX3CSvUbqqsX8xTVqIqQ7fFS6HWO6KZQVBsT6yugTwYHbyhNiU531JejYJ/I3ZrDhXfYH3qFZiYxnH1sifvwV+fnTtMXpPN7qPZwIymkjcmm6gJF51e0C7VOfUbvKFv0ngwj+ul21rgZSMuoEvxPK0WxtE3/ZSfn9c="
- - APT_DEPENDENCIES="doxygen libeigen3-dev libboost-test-dev libboost-python-dev python-numpy"
- - DEBSIGN_KEYID=5AE5CD75
- - CC=gcc
- - DO_COVERAGE_ON_BRANCH="master;release"
- - DO_CPPCHECK_ON_BRANCH=""
- - DO_INSTALL_DOC_EXCEPT_ON_BRANCH=""
- - MAKEFLAGS="-j2"
-
-jobs:
- include:
- - dist: bionic
- env:
- - BUILDTYPE=Release
- - TRAVIS_PYTHON_VERSION=27
- python: 2.7
- - dist: bionic
- env:
- - BUILDTYPE=Release
- - TRAVIS_PYTHON_VERSION=36
- python: 3.6
- - dist: bionic
- env:
- - BUILDTYPE=Debug
- - TRAVIS_PYTHON_VERSION=27
- python: 2.7
- - dist: bionic
- env:
- - BUILDTYPE=Debug
- - TRAVIS_PYTHON_VERSION=36
- python: 3.6
- - dist: xenial
- env:
- - BUILDTYPE=Release
- - TRAVIS_PYTHON_VERSION=27
- python: 2.7
- - dist: xenial
- env:
- - BUILDTYPE=Release
- - TRAVIS_PYTHON_VERSION=35
- python: 3.5
-
-notifications:
- email:
- - pinocchio-build@laas.fr
-branches:
- only:
- - master
- - debian
- - devel
-before_install: ./travis_custom/custom_before_install
-install: pip install coveralls numpy --user
-script:
- - export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}"
- - ./.travis/run ../travis_custom/custom_build
- - export PYTHON_DEFAULT_VERSION=$(which python2)
- - if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then export PYTHON_DEFAULT_VERSION=$(which python3); fi
- - export CMAKE_PREFIX_PATH=/tmp/_ci/install
- - cd $TRAVIS_BUILD_DIR/unittest/packaging/cmake
- - mkdir build
- - cd build
- - cmake .. -DPYTHON_EXECUTABLE=$PYTHON_DEFAULT_VERSION
- - make
- - ./extra_lib
- - cd $TRAVIS_BUILD_DIR/unittest/packaging/cmake-2x
- - mkdir build
- - cd build
- - cmake .. -DPYTHON_EXECUTABLE=$PYTHON_DEFAULT_VERSION
- - make
- - ./extra_lib
- - cd $TRAVIS_BUILD_DIR/unittest/packaging/pkgconfig
- - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/_ci/install/lib
- - export PKG_CONFIG_PATH=/tmp/_ci/install/lib/pkgconfig:$PKG_CONFIG_PATH
- - mkdir build
- - cd build
- - cmake .. -DPYTHON_EXECUTABLE=$PYTHON_DEFAULT_VERSION
- - make
- - ./extra_lib
- - cd /tmp/_ci/build
- - make uninstall
-after_failure: ./.travis/run after_failure
-after_success: ./.travis/run after_success
diff --git a/include/eigenpy/numpy-type.hpp b/include/eigenpy/numpy-type.hpp
index bef0f187bd6c1dec63818675d7c84e9f08c1e2c9..805d1dd18afcd0d87db45e2c9c9781948dee147d 100644
--- a/include/eigenpy/numpy-type.hpp
+++ b/include/eigenpy/numpy-type.hpp
@@ -20,7 +20,7 @@ namespace eigenpy
template<typename Scalar>
bool np_type_is_convertible_into_scalar(const int np_type)
{
- if(NumpyEquivalentType<Scalar>::type_code >= NPY_USERDEF)
+ if(static_cast<NPY_TYPES>(NumpyEquivalentType<Scalar>::type_code) >= NPY_USERDEF)
return np_type == Register::getTypeCode<Scalar>();
if(NumpyEquivalentType<Scalar>::type_code == np_type)
diff --git a/include/eigenpy/numpy.hpp b/include/eigenpy/numpy.hpp
index 8abb4c99a092d3e5e0e328dd85f0c8591340f98a..84c7575d7db74559b0807246e47279d1cf01b20e 100644
--- a/include/eigenpy/numpy.hpp
+++ b/include/eigenpy/numpy.hpp
@@ -33,7 +33,7 @@ namespace eigenpy
int EIGENPY_DLLAPI PyArray_TypeNum(PyTypeObject * type);
// By default, the Scalar is considered as a Python object
- template <typename Scalar> struct NumpyEquivalentType { enum { type_code = NPY_USERDEF };};
+ template <typename Scalar> struct NumpyEquivalentType { enum { type_code = NPY_USERDEF };};
template <> struct NumpyEquivalentType<float> { enum { type_code = NPY_FLOAT };};
template <> struct NumpyEquivalentType< std::complex<float> > { enum { type_code = NPY_CFLOAT };};
diff --git a/include/eigenpy/user-type.hpp b/include/eigenpy/user-type.hpp
index 9f2acc8ae999f1f7837327cf9f361f05f58ec089..a9b0ece5916e0b2fd945f34b612b67f5703b7a33 100644
--- a/include/eigenpy/user-type.hpp
+++ b/include/eigenpy/user-type.hpp
@@ -17,7 +17,7 @@ namespace eigenpy
{
static To run(const From & from)
{
- return static_cast<To>(from);
+ return (To)from;
}
};
diff --git a/travis_custom/custom_before_install b/travis_custom/custom_before_install
deleted file mode 100755
index 9fbf67f3a6737793c537863274f5c8b3df5a6af5..0000000000000000000000000000000000000000
--- a/travis_custom/custom_before_install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# Add Python dependency
-echo "TRAVIS_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION"
-if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
- export APT_DEPENDENCIES=$APT_DEPENDENCIES" python3-numpy"
-fi
-
-# When this script is called the current directory is ./custom_travis
-. ./.travis/run ../.travis/before_install
-
-# Git fetch tags
-git fetch --tags
-
diff --git a/travis_custom/custom_build b/travis_custom/custom_build
deleted file mode 100755
index 9874b08911860d82c03b44039dcf99d1b55b3b9c..0000000000000000000000000000000000000000
--- a/travis_custom/custom_build
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-# Setup environment variables.
-export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_TESTING=\"ON\" -DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED"
-if [[ ";${DO_INSTALL_DOC_EXCEPT_ON_BRANCH};" == *";${CI_BRANCH};"* ]]; then
- export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"OFF\""
-else
- export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"ON\""
-fi
-
-if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
- export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DPYTHON_EXECUTABLE=$(which python3)"
-fi
-
-# Setup environment variables.
-. ./.travis/run ../.travis/build
-