From b74e7ac47269bd1395bfe3be147a75afbb6c0cd6 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 10 Mar 2016 15:31:03 +0100 Subject: [PATCH 01/10] Travis: update matrix to build with python 3.4 * Fix #519 * Instead of python 3.2 --- .travis.yml | 2 +- tools/travis/launch_tests.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1645304d2..a3fc7b5c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ env: - CI_NODE_TOTAL=2 matrix: - PYTHON_VERSION=2.7 - - PYTHON_VERSION=3.2 + - PYTHON_VERSION=3.4 matrix: allow_failures: diff --git a/tools/travis/launch_tests.sh b/tools/travis/launch_tests.sh index 2ca6dc7b5..c53de0643 100755 --- a/tools/travis/launch_tests.sh +++ b/tools/travis/launch_tests.sh @@ -17,13 +17,11 @@ 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} make run_tests - From 62df9a0f05a38de487ac779a2026838ba2c92181 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 11 Mar 2016 11:38:56 +0100 Subject: [PATCH 02/10] Travis: specify docker service --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3fc7b5c7..3e64f31bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ -language: cpp - # Use container-based infrastructure -sudo: false +sudo: required +services: + - docker + +language: cpp os: - linux From 6e8b4d86cfe82f1ff05cd9c08ad3e51507011c6d Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 14 Mar 2016 09:23:50 +0100 Subject: [PATCH 03/10] Travis: install apt package libopenimageio-dev Instead of building it. --- .travis.yml | 2 +- tools/travis/install_dependencies.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e64f31bd..2e4c412d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ addons: - libtiff4-dev - libilmbase-dev - libopenexr-dev - # - libopenimageio-dev + - libopenimageio-dev - libglew-dev - libgraphviz-dev - graphviz-dev diff --git a/tools/travis/install_dependencies.sh b/tools/travis/install_dependencies.sh index c1acaeaa0..ba5fe712d 100755 --- a/tools/travis/install_dependencies.sh +++ b/tools/travis/install_dependencies.sh @@ -46,12 +46,12 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then cd OpenColorIO-1.0.9/build cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install - cd $TRAVIS_BUILD_DIR - wget https://github.com/OpenImageIO/oiio/archive/Release-1.5.16.tar.gz -O /tmp/oiio-1.5.16.tar.gz - tar -xzf /tmp/oiio-1.5.16.tar.gz > /dev/null 2>&1 - mkdir oiio-Release-1.5.16/build - cd oiio-Release-1.5.16/build - cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install + # cd $TRAVIS_BUILD_DIR + # wget https://github.com/OpenImageIO/oiio/archive/Release-1.5.16.tar.gz -O /tmp/oiio-1.5.16.tar.gz + # tar -xzf /tmp/oiio-1.5.16.tar.gz > /dev/null 2>&1 + # mkdir oiio-Release-1.5.16/build + # cd oiio-Release-1.5.16/build + # cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install else echo 'Using cached directory.'; From a91943288ddc118ab2b784195f0c8e08047b42fd Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 14 Mar 2016 09:24:48 +0100 Subject: [PATCH 04/10] Travis: do not install apt package libopenctl0.8 * Not found by Travis. * Already built when install dependencies. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e4c412d0..ce14d6410 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,7 +110,7 @@ addons: - libmagickcore-dev - liblcms2-dev - libyaml-dev - - libopenctl0.8 + # - libopenctl0.8 - libcaca-dev - libglui-dev - libtinyxml-dev From ec39b881f40c6a55ca537854800b04508d907a7c Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 14 Mar 2016 09:25:01 +0100 Subject: [PATCH 05/10] Travis: reorder apt packages --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce14d6410..d62931476 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,6 +82,8 @@ addons: - swig - libboost1.55-all-dev - python-dev + - python-nose + - python-imaging - python-numpy - python3-dev - python3-nose @@ -99,8 +101,6 @@ addons: - libglew-dev - libgraphviz-dev - graphviz-dev - - python-nose - - python-imaging - libopenjpeg-dev - libturbojpeg - libxmu-dev From 37c625b9a55283bd00625f05cb0c5923fb632192 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 15 Mar 2016 10:17:25 +0100 Subject: [PATCH 06/10] Travis: fixed use of container-based infrastructure https://docs.travis-ci.com/user/workers/container-based-infrastructure --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d62931476..bec8a7faa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ # Use container-based infrastructure -sudo: required +sudo: false services: - docker From 66b01748a1b709f75fedcae5b64e613b82df2714 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 15 Mar 2016 10:30:19 +0100 Subject: [PATCH 07/10] Travis: use Trusty beta environment https://docs.travis-ci.com/user/trusty-ci-environment/ --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bec8a7faa..aeed25e4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ # Use container-based infrastructure sudo: false -services: - - docker +dist: trusty language: cpp From 19bb94968163299b267433b6ecb2d88e20e9f678 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 16 Mar 2016 12:46:13 +0100 Subject: [PATCH 08/10] Travis: build libopenimageio from sources * Revert of commit 6e8b4d86cfe82f1ff05cd9c08ad3e51507011c6d. * It is because we use an other environment within Travis (trusty). --- .travis.yml | 2 +- tools/travis/install_dependencies.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index aeed25e4a..117d47bad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,7 @@ addons: - libtiff4-dev - libilmbase-dev - libopenexr-dev - - libopenimageio-dev + # - libopenimageio-dev - libglew-dev - libgraphviz-dev - graphviz-dev diff --git a/tools/travis/install_dependencies.sh b/tools/travis/install_dependencies.sh index ba5fe712d..c1acaeaa0 100755 --- a/tools/travis/install_dependencies.sh +++ b/tools/travis/install_dependencies.sh @@ -46,12 +46,12 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then cd OpenColorIO-1.0.9/build cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install - # cd $TRAVIS_BUILD_DIR - # wget https://github.com/OpenImageIO/oiio/archive/Release-1.5.16.tar.gz -O /tmp/oiio-1.5.16.tar.gz - # tar -xzf /tmp/oiio-1.5.16.tar.gz > /dev/null 2>&1 - # mkdir oiio-Release-1.5.16/build - # cd oiio-Release-1.5.16/build - # cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install + cd $TRAVIS_BUILD_DIR + wget https://github.com/OpenImageIO/oiio/archive/Release-1.5.16.tar.gz -O /tmp/oiio-1.5.16.tar.gz + tar -xzf /tmp/oiio-1.5.16.tar.gz > /dev/null 2>&1 + mkdir oiio-Release-1.5.16/build + cd oiio-Release-1.5.16/build + cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install else echo 'Using cached directory.'; From fae457f85744e7766ddf20396140f318f48b2cac Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 16 Mar 2016 14:26:18 +0100 Subject: [PATCH 09/10] Travis: explicitly install python3.4-dev --- .travis.yml | 4 ++-- libraries/tuttle/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a542637e..e2aaa8bd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,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 @@ -84,7 +84,7 @@ addons: - python-imaging - python-numpy - python-nose - - python3-dev + - python3.4-dev - python3-setuptools - python3-nose - libfreetype6-dev 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}) From ffb56ed13ffefe2cc2649c3249f1fb313438ef50 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 17 Mar 2016 09:28:25 +0100 Subject: [PATCH 10/10] CMake: fixed configure of applications if TUTTLE_PYTHON_VERSION is not defined --- applications/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) 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")