Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitee14235

Browse files
committed
Update appveyor config to use ffmpeg-4.2.1 and python3
1 parentee64295 commitee14235

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

‎appveyor.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ platform:
88
environment:
99
global:
1010
DEPENDENCY_NAME:ffmpeg
11-
DEPENDENCY_VERSION:2.4.5
11+
DEPENDENCY_VERSION:4.2.1
1212
DEPENDENCY_INSTALL_PATH:C:\ProgramData\install-dependency
1313
AVTRANSCODER_INSTALL_PATH:C:\projects\avtranscoder\build\install-avtranscoder
1414

@@ -20,27 +20,29 @@ init:
2020

2121
install:
2222
# Install build dependencies
23+
-choco install python --version=3.5.4
2324
-choco install -y swig
2425
-tools/appveyor/win.install.deps.bat
2526

2627
# Get the correct python version
28+
-cmd:dir "C:\"
2729
-ps:if($env:platform -eq 'x86') {
28-
$env:PYTHON = "C:\Python27";
30+
$env:PYTHON = "C:\Python35";
2931
}
3032
else {
31-
$env:PYTHON = "C:\Python27-x64";
33+
$env:PYTHON = "C:\Python35-x64";
3234
}
3335
# Prepend newly installed Python to the PATH of this build
3436
-cmd:set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
3537
-cmd:echo %PATH%
3638
# Check that we have the expected version and architecture for Python
37-
-"python --version"
38-
-"python -c\"import struct; print(struct.calcsize('P') * 8)\""
39+
-"python3 --version"
40+
-"python3 -c\"import struct; print(struct.calcsize('P') * 8)\""
3941
# Upgrade to the latest version of pip to avoid it displaying warnings about it being out of date.
40-
-pip install --disable-pip-version-check --user --upgrade pip
42+
-pip3 install --disable-pip-version-check --user --upgrade pip
4143

4244
# Install tests dependencies
43-
-pip install nose
45+
-pip3 install nose
4446

4547
build_script:
4648
-tools/appveyor/build.bat

‎tools/appveyor/python.nosetests.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
setPWD=C:\projects\avtranscoder
44

55
:: Get avtranscoder library
6-
setPYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python2.7\site-packages;%PYTHONPATH%
6+
setPYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python3.5\site-packages;%PYTHONPATH%
77
setPATH=%DEPENDENCY_INSTALL_PATH%\bin;%AVTRANSCODER_INSTALL_PATH%\lib;%PATH%
88

99
:: Get avtranscoder profiles
@@ -22,7 +22,7 @@ set AVTRANSCODER_TEST_IMAGE_JPG_FILE=%PWD%\avTranscoder-data\image\BigBuckBunny\
2222

2323
:: Launch tests
2424
cd test\pyTest
25-
nosetests
25+
python3 -m nose
2626
cd ..\..
2727

2828
@echooff

‎tools/appveyor/win.install.deps.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ if %platform% == X64 set PLATFORM_VERSION=64
55

66
:: Installing ffmpeg dev (include + apps)
77
curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z
8-
7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z
8+
7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.zip
99

1010
:: Installing ffmpeg shared (libs)
1111
curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z
12-
7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z
12+
7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.zip
1313

1414
move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev
1515
move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev%DEPENDENCY_INSTALL_PATH%

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp