From 73d3ced8499e29104d11f0ba47e00bfa23f3116c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 29 Dec 2021 09:29:38 +0100 Subject: [PATCH] [build] update FFmpeg to 4.3.2 for binary wheels Mention Python 3.10 compatibility, drop Python 3.6. --- .github/workflows/tests.yml | 3 ++- scripts/fetch-vendor.json | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ad4287a3c..1e38e5e64 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -217,13 +217,14 @@ jobs: brew install pkg-config - name: Build wheels env: + CIBW_ARCHS_WINDOWS: AMD64 CIBW_BEFORE_BUILD: pip install cython && python scripts/fetch-vendor /tmp/vendor CIBW_BEFORE_BUILD_WINDOWS: pip install cython && python scripts\fetch-vendor C:\cibw\vendor CIBW_ENVIRONMENT_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig CIBW_ENVIRONMENT_MACOS: PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig LDFLAGS=-headerpad_max_install_names CIBW_ENVIRONMENT_WINDOWS: INCLUDE=C:\\cibw\\vendor\\include LIB=C:\\cibw\\vendor\\lib PYAV_SKIP_TESTS=unicode_filename CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: python scripts/inject-dll {wheel} {dest_dir} C:\cibw\vendor\bin - CIBW_SKIP: cp27-* pp27-* pp36-win* + CIBW_SKIP: cp36-* pp36-* *-musllinux* CIBW_TEST_COMMAND: mv {project}/av {project}/av.disabled && python -m unittest discover -t {project} -s tests && mv {project}/av.disabled {project}/av # disable test suite on OS X, the SSL config seems broken CIBW_TEST_COMMAND_MACOS: true diff --git a/scripts/fetch-vendor.json b/scripts/fetch-vendor.json index 95829f1eb..4cddc2f3b 100644 --- a/scripts/fetch-vendor.json +++ b/scripts/fetch-vendor.json @@ -1,3 +1,3 @@ { - "urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.3.1-1/ffmpeg-{platform}.tar.gz"] + "urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.3.2-1/ffmpeg-{platform}.tar.gz"] } diff --git a/setup.py b/setup.py index e4135425f..c89b94caa 100644 --- a/setup.py +++ b/setup.py @@ -526,11 +526,11 @@ def run(self): 'Operating System :: Unix', 'Operating System :: Microsoft :: Windows', 'Programming Language :: Cython', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Conversion',