Update appveyor config to use ffmpeg-4.2.1 and python3

valnoel · valnoel · commit ee14235558f0 · 2020-01-22T10:37:42.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
 
@@ -20,27 +20,29 @@ init:
 
 install:
   # Install build dependencies
+  - choco install python --version=3.5.4
   - choco install -y swig
   - tools/appveyor/win.install.deps.bat
 
   # Get the correct python version
+  - cmd: dir "C:\"
   - 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%
   - cmd: echo %PATH%
   # Check that we have the expected version and architecture for Python
-  - "python --version"
-  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "python3 --version"
+  - "python3 -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
+  - pip3 install --disable-pip-version-check --user --upgrade pip
 
   # Install tests dependencies
-  - pip install nose
+  - pip3 install nose
 
 build_script:
   - tools/appveyor/build.bat
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
+python3 -m nose
 cd ..\..
 
 @echo off
diff --git a/tools/appveyor/win.install.deps.bat b/tools/appveyor/win.install.deps.bat
@@ -5,11 +5,11 @@ 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
+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
+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%
