diff --git a/.travis.yml b/.travis.yml index 542c7fa5c..f799c2695 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ -language: cpp - # Use container-based infrastructure sudo: false +dist: trusty + +language: cpp os: - linux @@ -25,7 +26,7 @@ env: - CI_NODE_TOTAL=2 matrix: - PYTHON_VERSION=2.7 - - PYTHON_VERSION=3.2 + - PYTHON_VERSION=3.4 matrix: allow_failures: @@ -74,7 +75,7 @@ after_failure: addons: apt: - sources: ['boost-latest', 'kalakris-cmake', 'kubuntu-backports', 'pythonxy-devel'] + sources: ['boost-latest', 'kalakris-cmake', 'kubuntu-backports', 'pythonxy-devel', 'deadsnakes'] packages: - cmake - swig @@ -83,7 +84,7 @@ addons: - python-imaging - python-numpy - python-nose - - python3-dev + - python3.4-dev - python3-setuptools - python3-nose - libfreetype6-dev @@ -109,7 +110,7 @@ addons: - libmagickcore-dev - liblcms2-dev - libyaml-dev - - libopenctl0.8 + # - libopenctl0.8 - libcaca-dev - libglui-dev - libtinyxml-dev diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index c79bdbdef..1b6cba8f9 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -4,6 +4,10 @@ add_subdirectory(sam) # scripts add_subdirectory(script) +if(NOT TUTTLE_PYTHON_VERSION) + return() +endif() + # Edit python scripts if the host is built with python3 if(${TUTTLE_PYTHON_VERSION} VERSION_GREATER "3") set(BASH_PYTHON2 "#!/usr/bin/env python") diff --git a/libraries/tuttle/CMakeLists.txt b/libraries/tuttle/CMakeLists.txt index 829d9f461..ae8f01b17 100644 --- a/libraries/tuttle/CMakeLists.txt +++ b/libraries/tuttle/CMakeLists.txt @@ -130,6 +130,7 @@ if (TuttleBoost_FOUND) include(${SWIG_USE_FILE}) # Find python c libs + set(Python_ADDITIONAL_VERSIONS ${TUTTLE_PYTHON_VERSION}) find_package(PythonLibs ${TUTTLE_PYTHON_VERSION}) set(TUTTLE_PYTHON_VERSION ${PYTHONLIBS_VERSION_STRING}) include_directories(${PYTHON_INCLUDE_DIRS}) diff --git a/tools/travis/launch_tests.sh b/tools/travis/launch_tests.sh index a0e2ca0a0..49f76f687 100755 --- a/tools/travis/launch_tests.sh +++ b/tools/travis/launch_tests.sh @@ -18,11 +18,10 @@ git clone https://github.com/tuttleofx/TuttleOFX-data.git ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest/TuttleOFX-data if [[ ${PYTHON_VERSION} == "2.7" ]]; then nosetests ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v -elif [[ ${PYTHON_VERSION} == "3.2" ]]; then +elif [[ ${PYTHON_VERSION} == "3.4" ]]; then nosetests3 ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v fi - # boost unit tests ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/testBin/TuttleOFX-data cd ${TUTTLEOFX_BUILD}