From 48e8e902b5a09218ab892615d8ba6b6c7a78780c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Sun, 29 Oct 2023 21:55:43 +0100 Subject: [PATCH] Explicitly drop support for FFmpeg < 5.0 Our code now depends on FFmpeg 5.0 or better, so update the test matrix. --- .github/workflows/tests.yml | 28 ++++++++++------------------ docs/overview/installation.rst | 2 +- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dc5db3b5b..7d1b1a455 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -57,10 +57,8 @@ jobs: config: - {os: ubuntu-latest, python: 3.8, ffmpeg: "5.1", extras: true} - {os: ubuntu-latest, python: 3.8, ffmpeg: "5.0"} - - {os: ubuntu-latest, python: 3.8, ffmpeg: "4.4"} - - {os: ubuntu-latest, python: 3.8, ffmpeg: "4.3"} - - {os: ubuntu-latest, python: pypy3.9, ffmpeg: "4.4"} - - {os: macos-latest, python: 3.8, ffmpeg: "4.4"} + - {os: ubuntu-latest, python: pypy3.9, ffmpeg: "5.0"} + - {os: macos-latest, python: 3.8, ffmpeg: "5.0"} env: PYAV_PYTHON: python${{ matrix.config.python }} @@ -145,8 +143,6 @@ jobs: config: - {os: windows-latest, python: 3.8, ffmpeg: "5.1"} - {os: windows-latest, python: 3.8, ffmpeg: "5.0"} - - {os: windows-latest, python: 3.8, ffmpeg: "4.4"} - - {os: windows-latest, python: 3.8, ffmpeg: "4.3"} steps: - name: Checkout @@ -164,24 +160,20 @@ jobs: pillow \ python=${{ matrix.config.python }} \ setuptools - if [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then - curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.2-1/ffmpeg-win_amd64.tar.gz - elif [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then - curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz - elif [[ "${{ matrix.config.ffmpeg }}" == "4.4" ]]; then - curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.4.1-8/ffmpeg-win_amd64.tar.gz - else - conda install -q -n pyav ffmpeg=${{ matrix.config.ffmpeg }} - fi + if [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then + curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.2-1/ffmpeg-win_amd64.tar.gz + elif [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then + curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz + else + exit 1 + fi - name: Build shell: bash run: | . $CONDA/etc/profile.d/conda.sh conda activate pyav - if [[ "${{ matrix.config.ffmpeg }}" != "4.3" ]]; then - tar -xf ffmpeg.tar.gz -C $CONDA_PREFIX/Library/ - fi + tar -xf ffmpeg.tar.gz -C $CONDA_PREFIX/Library/ python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX/Library - name: Test diff --git a/docs/overview/installation.rst b/docs/overview/installation.rst index 9ac4dc078..72afe8d52 100644 --- a/docs/overview/installation.rst +++ b/docs/overview/installation.rst @@ -56,7 +56,7 @@ See the `Conda quick install `_ docs t Bring your own FFmpeg --------------------- -PyAV can also be compiled against your own build of FFmpeg ((version ``4.3`` or higher). You can force installing PyAV from source by running: +PyAV can also be compiled against your own build of FFmpeg ((version ``5.0`` or higher). You can force installing PyAV from source by running: .. code-block:: bash