diff --git a/azure-pipelines.yml b/azure-pipelines.yml index db2d4f2ba..948047c90 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,45 +21,14 @@ jobs: python.version: '3.6' Python37: python.version: '3.7' - maxParallel: 4 + Python38: + python.version: '3.8' + maxParallel: 5 steps: - #- script: | - # Make sure all packages are pulled from latest - #sudo apt-get update - - # Fail out if any setups fail - #set -e - - # Delete old Pythons - #rm -rf $AGENT_TOOLSDIRECTORY/Python/2.7.16 - #rm -rf $AGENT_TOOLSDIRECTORY/Python/3.5.7 - #rm -rf $AGENT_TOOLSDIRECTORY/Python/3.7.3 - - # Download new Pythons - #azcopy --recursive \ - #--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/2.7.15 \ - #--destination $AGENT_TOOLSDIRECTORY/Python/2.7.15 - - #azcopy --recursive \ - #--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.5.5 \ - #--destination $AGENT_TOOLSDIRECTORY/Python/3.5.5 - - #azcopy --recursive \ - #--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.7.2 \ - #--destination $AGENT_TOOLSDIRECTORY/Python/3.7.2 - - # Install new Pythons - #original_directory=$PWD - #setups=$(find $AGENT_TOOLSDIRECTORY/Python -name setup.sh) - #for setup in $setups; do - #chmod +x $setup; - #cd $(dirname $setup); - #./$(basename $setup); - #cd $original_directory; - #done; - #displayName: 'Workaround: update apt and roll back Python versions' - + - script: sudo apt-get install ffmpeg + displayName: 'Install ffmpeg' + - task: UsePythonVersion@0 inputs: versionSpec: '$(python.version)' @@ -68,9 +37,6 @@ jobs: - script: python -m pip install --upgrade pip displayName: 'Install dependencies' - - script: sudo apt-get install ffmpeg - displayName: 'Install ffmpeg' - - script: | pip install pytest pytest tests --doctest-modules --junitxml=junit/test-results.xml diff --git a/eol.py b/eol.py index 7310cfd65..fa328fdd7 100644 --- a/eol.py +++ b/eol.py @@ -28,6 +28,7 @@ def date(string, fmt='%Y-%m-%d'): # https://devguide.python.org/ # https://devguide.python.org/devcycle/#devcycle PYTHON_EOL = { + (3, 8): date('2024-10-14'), (3, 7): date('2023-06-27'), (3, 6): date('2021-12-23'), (3, 5): date('2020-09-13'), diff --git a/tests/test_transcoder.py b/tests/test_transcoder.py index 448ceeaf9..5c5b73ac2 100755 --- a/tests/test_transcoder.py +++ b/tests/test_transcoder.py @@ -11,4 +11,4 @@ def test_transcoder_check(): - assert transcoder.is_video_good(core.TEST_FILE, 0) is True + assert transcoder.is_video_good(core.TEST_FILE, 1) is True