From acd97daf66ec0749d37627fb9ad4557b1b33a6d0 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 27 May 2016 18:28:55 +0200 Subject: [PATCH] Travis: updated matrix to build for python3.4 Up Travis VM to ubuntu trusty. --- .travis.yml | 10 ++++++---- tools/travis/launch_tests.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 542c7fa5c..22cff3879 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: cpp # Use container-based infrastructure -sudo: false +sudo: required +dist: trusty 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: @@ -84,19 +85,20 @@ addons: - python-numpy - python-nose - python3-dev + - python3-numpy - python3-setuptools - python3-nose - libfreetype6-dev - libbz2-dev - libltdl-dev - - libpng-dev + - libpng12-dev - libjpeg-dev - libraw-dev - libglew-dev - libtiff4-dev - libilmbase-dev - libopenexr-dev - # - libopenimageio-dev + - libopenimageio-dev - libglew-dev - libgraphviz-dev - graphviz-dev diff --git a/tools/travis/launch_tests.sh b/tools/travis/launch_tests.sh index a0e2ca0a0..a2e2fc598 100755 --- a/tools/travis/launch_tests.sh +++ b/tools/travis/launch_tests.sh @@ -18,7 +18,7 @@ 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