Travis: build TuttleOFX WITHOUT_NUMPY

* Because by default on Travis, numpy-dev package is not 1.8 (what we need). * Issue tuttleofx#433 * Can use nose-exclude plugin: pip install nose-exclude (but need sudo permissions).
cchampet · Jul 20, 2015 · 414c7dc · 414c7dc
1 parent c3a588a
commit 414c7dc
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/cmake/TuttleMacros.cmake b/cmake/TuttleMacros.cmake
@@ -39,8 +39,8 @@ endfunction(tuttle_get_path_to_install_python)
 # Install dynamic libraries in the TUTTLE/lib folder
 function(tuttle_install_shared_libs LIBRARIES)
     foreach(lib ${LIBRARIES})
-        # Is is a shared library ?
-        if (${lib} MATCHES ".*\\.so.*")
+        # Is it a shared library?
+        if(${lib} MATCHES ".*\\.so.*")
             get_filename_component(realpath ${lib} REALPATH) 
             tuttle_get_library_soname(${realpath} SONAME)
             message("will copy and rename ${realpath} to ${SONAME}") 

diff --git a/libraries/tuttle/CMakeLists.txt b/libraries/tuttle/CMakeLists.txt
@@ -141,6 +141,7 @@ if (TuttleBoost_FOUND)
     # Numpy
     if(WITHOUT_NUMPY)
         # Add swig flag to create binding without Numpy
+        message("Build TuttleOFX python binding without numpy module.")
         set(SWIG_NUMPY_FLAG "-DWITHOUT_NUMPY")
     else()
         # Find numpy headers

diff --git a/libraries/tuttle/pyTest/memory/testMemoryCache.py b/libraries/tuttle/pyTest/memory/testMemoryCache.py
@@ -27,5 +27,3 @@ def testOutputMemoryCache():
 	print('imgRes:', dir( imgRes ))
 	print('FullName:', imgRes.getFullName())
 	print('MemorySize:', imgRes.getMemorySize())
-
-	img = imgRes.getNumpyImage()
diff --git a/libraries/tuttle/pyTest/memory/testUnusedNodes.py b/libraries/tuttle/pyTest/memory/testUnusedNodes.py
@@ -41,4 +41,3 @@ def testUnusedNodes():
 	# Trying to compute all nodes should raise an error
 	# on unconnected filters (invert and pushpixel).
 	assert_raises(Exception, g.compute, outputCache)
-
diff --git a/libraries/tuttle/pyTest/numpy/__init__.py b/libraries/tuttle/pyTest/numpy/__init__.py
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
@@ -19,7 +19,7 @@ fi
 
 # Build tuttle
 cmake --version
-cmake -DTUTTLE_EXPERIMENTAL=True -DCMAKE_INSTALL_PREFIX=${TUTTLE_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH ..
+cmake -DTUTTLE_EXPERIMENTAL=True -DCMAKE_INSTALL_PREFIX=${TUTTLE_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DWITHOUT_NUMPY=True ..
 make -j${CI_NODE_TOTAL} -k
 make install
 cd ..