diff --git a/.travis.yml b/.travis.yml index 542c7fa5c..3ed513e83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,6 @@ addons: - libboost1.55-all-dev - python-dev - python-imaging - - python-numpy - python-nose - python3-dev - python3-setuptools diff --git a/libraries/tuttle/CMakeLists.txt b/libraries/tuttle/CMakeLists.txt index 829d9f461..f9652cbf5 100644 --- a/libraries/tuttle/CMakeLists.txt +++ b/libraries/tuttle/CMakeLists.txt @@ -145,6 +145,7 @@ if (TuttleBoost_FOUND) if(NUMPY_FOUND) include_directories(${NUMPY_INCLUDE_DIR}) else() + message(WARNING "Cannot find numpy headers: TuttleOFX python binding will not use numpy.") set(SWIG_NUMPY_FLAG "-DWITHOUT_NUMPY") endif() endif() diff --git a/libraries/tuttle/pyTest/numpy/__init__.py b/libraries/tuttle/pyTest/numpy/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tools/travis/build.sh b/tools/travis/build.sh index a96180e2a..7a29e6f03 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -19,7 +19,7 @@ fi # Build tuttle cmake --version -cmake ${TUTTLEOFX_DEV} -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${TUTTLEOFX_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DTUTTLE_EXPERIMENTAL=True -DWITHOUT_NUMPY=True -DTUTTLE_DEPLOY_DEPENDENCIES=True -DTUTTLE_PYTHON_VERSION=${PYTHON_VERSION} +cmake ${TUTTLEOFX_DEV} -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${TUTTLEOFX_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DTUTTLE_EXPERIMENTAL=True -DTUTTLE_DEPLOY_DEPENDENCIES=True -DTUTTLE_PYTHON_VERSION=${PYTHON_VERSION} make -k make install/strip cd .. diff --git a/tools/travis/install_dependencies.sh b/tools/travis/install_dependencies.sh index 134176adf..d9b36e7ed 100755 --- a/tools/travis/install_dependencies.sh +++ b/tools/travis/install_dependencies.sh @@ -10,9 +10,11 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # Install python packages to run sam command line if [[ ${PYTHON_VERSION} == "2.7" ]]; then pip install --user clint argcomplete - # elif [[ ${PYTHON_VERSION} == "3.2" ]]; then + pip install --user numpy + elif [[ ${PYTHON_VERSION} == "3.2" ]]; then # easy_install3 pip --prefix=$HOME/local # pip3 install --user clint argcomplete + pip3 install --user numpy fi # Use TRAVIS_JOB_ID to detect that we are in travis.