From e3d6ef0911ade32cc3b0f7ef09537b7e7f2bc590 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 2 Nov 2026 12:11:48 +0100 Subject: [PATCH] Add Python 3.15 to the testing --- .github/workflows/pythonapp.yml | 44 ++++++++++++++++----------------- setup.py | 1 + 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 214a724..9906c77 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -19,7 +19,7 @@ jobs: FFMPEG_ROOT: ~/ff_deps/ffmpeg strategy: matrix: - python: [ '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] + python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.15'] steps: - uses: actions/checkout@v7.0.1 - name: Set up Python ${{ matrix.python }} @@ -61,7 +61,7 @@ jobs: ls $env:FFMPEG_ROOT - name: Install pip deps run: | - python -m pip install --upgrade pip virtualenv wheel setuptools "cython~=3.0.11; python_version < '3.14'" "cython~=3.1.8; python_version >= '3.14'" pytest + python -m pip install --upgrade pip virtualenv wheel setuptools "cython~=3.0.11; python_version < '3.14'" "cython~=3.3.1; python_version >= '3.14'" pytest - name: Make sdist if: matrix.python == '3.13' run: python setup.py sdist --formats=gztar @@ -124,16 +124,16 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-24.04 # Ubuntu 26.04: apt install libpostproc-dev fails #201 - os: ubuntu-24.04-arm runs-on: ${{ matrix.os }} needs: windows_wheels_tests steps: - uses: actions/checkout@v7.0.1 - - name: Set up Python 3.14 + - name: Set up Python 3.15 uses: actions/setup-python@v7.1.0 with: - python-version: '3.14' + python-version: '3.15' - uses: actions/download-artifact@v8.0.2 with: pattern: py_wheel-* @@ -144,7 +144,7 @@ jobs: sudo apt update sudo apt install -y ffmpeg libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev sudo apt install -y libavutil-dev libswscale-dev libswresample-dev libpostproc-dev libsdl2-dev libsdl2-2.0-0 - sudo apt install -y libsdl2-mixer-2.0-0 libsdl2-mixer-dev python3-dev python3 + sudo apt install -y libsdl2-mixer-2.0-0 libsdl2-mixer-dev python3 -m pip install pytest root=`pwd` @@ -164,16 +164,16 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-24.04 # Ubuntu 26.04: apt install libpostproc-dev fails #201 - os: ubuntu-24.04-arm runs-on: ${{ matrix.os }} needs: linux_wheels steps: - uses: actions/checkout@v7.0.1 - - name: Set up Python 3.14 + - name: Set up Python 3.15 uses: actions/setup-python@v7.1.0 with: - python-version: '3.14' + python-version: '3.15' - uses: actions/download-artifact@v8.0.2 with: pattern: py_wheel-* @@ -217,16 +217,16 @@ jobs: include: - os: ubuntu-latest cibw_archs: 'x86_64' - cibw_build: 'cp39-manylinux_x86_64 cp310-manylinux_x86_64 cp311-manylinux_x86_64 cp312-manylinux_x86_64 cp313-manylinux_x86_64 cp314-manylinux_x86_64' + cibw_build: 'cp39-manylinux_x86_64 cp310-manylinux_x86_64 cp311-manylinux_x86_64 cp312-manylinux_x86_64 cp313-manylinux_x86_64 cp314-manylinux_x86_64 cp315-manylinux_x86_64' - os: ubuntu-24.04-arm cibw_archs: 'aarch64' - cibw_build: 'cp39-manylinux_aarch64 cp310-manylinux_aarch64 cp311-manylinux_aarch64 cp312-manylinux_aarch64 cp313-manylinux_aarch64 cp314-manylinux_aarch64' + cibw_build: 'cp39-manylinux_aarch64 cp310-manylinux_aarch64 cp311-manylinux_aarch64 cp312-manylinux_aarch64 cp313-manylinux_aarch64 cp314-manylinux_aarch64 cp315-manylinux_aarch64' steps: - uses: actions/checkout@v7.0.1 - - name: Set up Python 3.14 + - name: Set up Python 3.15 uses: actions/setup-python@v7.1.0 with: - python-version: '3.14' + python-version: '3.15' - uses: actions/cache@v6.1.0 id: deps-cache with: @@ -244,7 +244,7 @@ jobs: rm -rf git_deps - name: Install cibuildwheel run: | - python -m pip install cibuildwheel~=3.4.1 + python -m pip install cibuildwheel~=4.3.5 - name: Make wheels run: | python -m cibuildwheel --output-dir dist @@ -276,7 +276,7 @@ jobs: FFMPEG_BUILD_PATH: "ffmpeg_build" CIBW_BUILD_VERBOSITY: 3 CIBW_BUILD_FRONTEND: pip - CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-* cp314-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-* cp314-* cp315-*" CIBW_ARCHS_MACOS: ${{ matrix.arch }} CIBW_REPAIR_WHEEL_COMMAND_MACOS: > DYLD_FALLBACK_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && @@ -289,7 +289,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v7.1.0 with: - python-version: '3.14' + python-version: '3.15' - name: Cache ffmpeg id: cache-ffmpeg @@ -303,7 +303,7 @@ jobs: - name: Install cibuildwheel run: | - python -m pip install cibuildwheel~=3.4.1 + python -m pip install cibuildwheel~=4.3.5 - name: Build wheels run: | export REPAIR_LIBRARY_PATH="$HOME/${{ env.FFMPEG_BUILD_PATH }}_${{ matrix.arch }}/lib" @@ -324,7 +324,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v7.1.0 with: - python-version: '3.14' + python-version: '3.15' - uses: actions/download-artifact@v8.0.2 with: @@ -372,19 +372,19 @@ jobs: pytest "$name/tests" docs: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 # Ubuntu 26.04: apt install libpostproc-dev fails #201 steps: - uses: actions/checkout@v7.0.1 - - name: Set up Python 3.14 + - name: Set up Python 3.15 uses: actions/setup-python@v7.1.0 with: - python-version: '3.14' + python-version: '3.15' - name: Install run: | sudo apt update sudo apt install ffmpeg libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev sudo apt install libavutil-dev libswscale-dev libswresample-dev libpostproc-dev libsdl2-dev libsdl2-2.0-0 - sudo apt install libsdl2-mixer-2.0-0 libsdl2-mixer-dev python3-dev + sudo apt install libsdl2-mixer-2.0-0 libsdl2-mixer-dev python -m pip install --upgrade pip virtualenv wheel setuptools sphinx sphinx_rtd_theme python -m pip install -e . diff --git a/setup.py b/setup.py index 845eaa6..26818b2 100644 --- a/setup.py +++ b/setup.py @@ -404,6 +404,7 @@ def get_wheel_data(): 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: 3.13', 'Programming Language :: Python :: 3.14', + 'Programming Language :: Python :: 3.15', 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX :: BSD :: FreeBSD',