Appveyor: update FFmpeg version to 4.* and use Python3 for unit tests

valnoel · valnoel · commit 37af8e4ca0f0 · 2020-01-23T16:11:32.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ platform:
 environment:
   global:
     DEPENDENCY_NAME: ffmpeg
-    DEPENDENCY_VERSION: 2.4.5
+    DEPENDENCY_VERSION: 4.2.1
     DEPENDENCY_INSTALL_PATH: C:\ProgramData\install-dependency
     AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install-avtranscoder
 
@@ -25,10 +25,10 @@ install:
 
   # Get the correct python version
   - ps: if($env:platform -eq 'x86') {
-          $env:PYTHON = "C:\Python27";
+          $env:PYTHON = "C:\Python35";
         }
         else {
-          $env:PYTHON = "C:\Python27-x64";
+          $env:PYTHON = "C:\Python35-x64";
         }
   # Prepend newly installed Python to the PATH of this build
   - cmd: set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
@@ -37,7 +37,7 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Upgrade to the latest version of pip to avoid it displaying warnings about it being out of date.
-  - pip install --disable-pip-version-check --user --upgrade pip
+  - "python -m pip install --disable-pip-version-check --user --upgrade pip"
 
   # Install tests dependencies
   - pip install nose
diff --git a/tools/appveyor/build.bat b/tools/appveyor/build.bat
@@ -4,7 +4,12 @@ MKDIR build
 cd build
 
 :: Configure
-call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%AVTRANSCODER_INSTALL_PATH% -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
+call cmake.exe .. -G "NMake Makefiles" ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_PREFIX=%AVTRANSCODER_INSTALL_PATH% ^
+    -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% ^
+    -DPYTHON_LIBRARY="C:\Python35\libs\python35.lib" ^
+    -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=3.5
 
 :: Build & Install
 call nmake /F Makefile
diff --git a/tools/appveyor/python.nosetests.bat b/tools/appveyor/python.nosetests.bat
@@ -3,7 +3,7 @@
 set PWD=C:\projects\avtranscoder
 
 :: Get avtranscoder library
-set PYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python2.7\site-packages;%PYTHONPATH%
+set PYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python3.5\site-packages;%PYTHONPATH%
 set PATH=%DEPENDENCY_INSTALL_PATH%\bin;%AVTRANSCODER_INSTALL_PATH%\lib;%PATH%
 
 :: Get avtranscoder profiles
@@ -22,7 +22,7 @@ set AVTRANSCODER_TEST_IMAGE_JPG_FILE=%PWD%\avTranscoder-data\image\BigBuckBunny\
 
 :: Launch tests
 cd test\pyTest
-nosetests
+python -m nose
 cd ..\..
 
 @echo off
diff --git a/tools/appveyor/win.install.deps.bat b/tools/appveyor/win.install.deps.bat
@@ -4,12 +4,12 @@ if %platform% == x86 set PLATFORM_VERSION=32
 if %platform% == X64 set PLATFORM_VERSION=64
 
 :: Installing ffmpeg dev (include + apps)
-curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z
-7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z
+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.zip
+7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.zip
 
 :: Installing ffmpeg shared (libs)
-curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z
-7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z
+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.zip
+7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.zip
 
 move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev
 move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev %DEPENDENCY_INSTALL_PATH%
