From ed8e280b93649d11b22921e7c785918567dd5fc0 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 11 Nov 2026 10:21:53 +0300 Subject: [PATCH 1/5] Submodules update to OpenCV 5.1.0 --- .github/workflows/build_wheels_macos.yml | 2 +- .github/workflows/build_wheels_manylinux.yml | 2 +- opencv | 2 +- opencv_contrib | 2 +- opencv_extra | 2 +- setup.py | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml index c52bfe34..1452745b 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] diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index d614c28a..0edb5d60 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -93,7 +93,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_64, aarch64] manylinux: [2014, 2_28] with_contrib: [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", From b94d62ffd5ae14182f888cc099843abcca9d163a Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 12 Nov 2026 17:11:09 +0300 Subject: [PATCH 2/5] Hack samples data search patch. --- .github/workflows/build_wheels_macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml index 1452745b..06ab6c00 100644 --- a/.github/workflows/build_wheels_macos.yml +++ b/.github/workflows/build_wheels_macos.yml @@ -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: From 9c7d7a44435bb99c6f1965c7b67e9ea42f5a5583 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 13 Nov 2026 14:41:51 +0300 Subject: [PATCH 3/5] Similar patch for Linux. --- .github/workflows/build_wheels_manylinux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index 0edb5d60..1cd66c9b 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -111,7 +111,7 @@ 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' || '' }} + OPENCV_SAMPLES_DATA_PATH: ${{ github.workspace }}/opencv/samples/data/ steps: - name: Cleanup run: find . -mindepth 1 -delete From 21fe25f73366bf28e4fefeb511e9f0fbbb7f9c04 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 13 Nov 2026 15:53:25 +0300 Subject: [PATCH 4/5] Fix samples data path again. --- .github/workflows/build_wheels_manylinux.yml | 1 - travis_config.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index 1cd66c9b..39675504 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 }} - OPENCV_SAMPLES_DATA_PATH: ${{ github.workspace }}/opencv/samples/data/ steps: - name: Cleanup run: find . -mindepth 1 -delete 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 From 146c3b17389de21bbda402a3e39c663be0ab7d61 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 13 Nov 2026 16:59:35 +0300 Subject: [PATCH 5/5] Disable python3.15 test for now as it's not available in multibuild. --- .github/workflows/build_wheels_manylinux.yml | 2 +- .github/workflows/build_wheels_windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index 39675504..908ca7cd 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -93,7 +93,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.15'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] platform: [x86_64, aarch64] manylinux: [2014, 2_28] with_contrib: [0, 1] 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]