diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml index c52bfe34..06ab6c00 100644 --- a/.github/workflows/build_wheels_macos.yml +++ b/.github/workflows/build_wheels_macos.yml @@ -83,7 +83,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.10', '3.11', '3.12', '3.13', '3.14'] + python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.15'] platform: [x86_64, arm64] with_contrib: [0, 1] without_gui: [0, 1] @@ -96,6 +96,7 @@ jobs: OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple + OPENCV_SAMPLES_DATA_PATH: ${{ github.workspace }}/opencv/samples/data/ steps: - uses: actions/setup-python@v7 with: diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index d614c28a..908ca7cd 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -111,7 +111,6 @@ jobs: SDIST: ${{ matrix.build_sdist || 0 }} ENABLE_HEADLESS: ${{ matrix.without_gui }} ENABLE_CONTRIB: ${{ matrix.with_contrib }} - DOCKER_TEST_IMAGE: ${{ matrix.platform == 'aarch64' && 'quay.io/opencv-ci/multibuild-noble_arm64v8:2026-06-15' || '' }} steps: - name: Cleanup run: find . -mindepth 1 -delete diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 81098be0..b9aecb72 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -84,7 +84,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.15'] platform: [x86, x64] with_contrib: [0, 1] without_gui: [0, 1] diff --git a/opencv b/opencv index 40738fb1..e4f78fbc 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 40738fb16ceddb5fb3fea747585f7ce6abb0605b +Subproject commit e4f78fbcf1a773fbed69e14500e8b734963eb585 diff --git a/opencv_contrib b/opencv_contrib index 755e5067..b67a8551 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit 755e50675d97db9b7d449d8bd6b09888646f6c6e +Subproject commit b67a855188a3d683813731010f6d39ac614733a4 diff --git a/opencv_extra b/opencv_extra index 3becd947..c9608cf1 160000 --- a/opencv_extra +++ b/opencv_extra @@ -1 +1 @@ -Subproject commit 3becd947dd6bf6340047de8ca4445a70271e6073 +Subproject commit c9608cf1253af28797bca7550846d13c7db81de7 diff --git a/setup.py b/setup.py index a6f10ffb..29e22e32 100755 --- a/setup.py +++ b/setup.py @@ -307,6 +307,7 @@ def main(): "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Programming Language :: Python :: 3.14", + "Programming Language :: Python :: 3.15", "Programming Language :: C++", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Scientific/Engineering", diff --git a/travis_config.sh b/travis_config.sh index 7504f4b2..4668e60f 100644 --- a/travis_config.sh +++ b/travis_config.sh @@ -152,6 +152,7 @@ function run_tests { cd /io/opencv export OPENCV_TEST_DATA_PATH=/io/opencv_extra/testdata + export OPENCV_SAMPLES_DATA_PATH=/io/opencv/samples/data test_wheels pylint_test