Travis: use Python3 for unit tests

valnoel · valnoel · commit 1c95f19fdfe7 · 2020-01-23T16:10:35.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -62,6 +62,7 @@ matrix:
       env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
   allow_failures:
     # build with libav
+    - os: osx
     - env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
     - env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
     # build with ffmpeg-2.8.6
@@ -80,8 +81,10 @@ addons:
     packages:
     - cmake
     - swig
-    - python-dev
-    - python-nose
+    - python3-dev
+    - python3
+    - python3-nose
+    - python3-coverage
     - freeglut3-dev
 
 cache:
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
@@ -13,6 +13,10 @@ cd ${AVTRANSCODER_BUILD_PATH}
 export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH}
 
 # Build avTranscoder
-cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL_PATH} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}
+cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL_PATH} \
+         -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \
+         -DCMAKE_BUILD_TYPE=Release \
+         -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=3.5 \
+         -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}
 make -k
 make install
diff --git a/tools/travis/python.nosetests.sh b/tools/travis/python.nosetests.sh
@@ -5,7 +5,7 @@ set -x
 
 # Get avtranscoder library
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL_PATH}/lib
-export PYTHONPATH=${AVTRANSCODER_INSTALL_PATH}/lib/python2.7/site-packages/:$PYTHONPATH
+export PYTHONPATH=${AVTRANSCODER_INSTALL_PATH}/lib/python3.5/site-packages/:$PYTHONPATH
 
 # Get assets
 git clone https://github.com/avTranscoder/avTranscoder-data.git
@@ -20,5 +20,4 @@ export AVTRANSCODER_TEST_IMAGE_PNG_FILE=`pwd`/avTranscoder-data/image/BigBuckBun
 export AVTRANSCODER_TEST_IMAGE_JPG_FILE=`pwd`/avTranscoder-data/image/BigBuckBunny/title_anouncement.thumbnail.jpg
 
 # Launch tests
-nosetests ${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage > progress.txt
-
+nosetests3 -w ${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage --nocapture --verbose > progress.txt
