From e4a4ca87be1a824fa8852622013ec8164d83e8a3 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 18 Jun 2026 14:29:06 +0300 Subject: [PATCH 1/4] 3rdparty licenses update for 5.x. --- LICENSE-3RD-PARTY.txt | 116 ++++++++++++++++++++++++++++-------------- 1 file changed, 79 insertions(+), 37 deletions(-) diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt index 86c43de81..1f06ebe01 100644 --- a/LICENSE-3RD-PARTY.txt +++ b/LICENSE-3RD-PARTY.txt @@ -2949,43 +2949,6 @@ WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ------------------------------------------------------------------------------- -OpenEXR library is redistributed within all opencv-python packages. - -Copyright (c) 2006, Industrial Light & Magic, a division of Lucasfilm -Entertainment Company Ltd. Portions contributed and copyright held by -others as indicated. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above - copyright notice, this list of conditions and the following - disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with - the distribution. - - * Neither the name of Industrial Light & Magic nor the names of - any other contributors to this software may be used to endorse or - promote products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ------------------------------------------------------------------------------ Intel(R) IPP ICV library statically linked within x86 and x86_64 opencv-python packages. @@ -3573,3 +3536,82 @@ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ + +MLAS library is redistributed within all opencv-python packages. + +MIT License + +Copyright (c) Microsoft Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +------------------------------------------------------------------------------ + +CLapack library is redistributed within opencv-python packages for Windows. + +Copyright (c) 1992-2017 The University of Tennessee and The University + of Tennessee Research Foundation. All rights + reserved. +Copyright (c) 2000-2017 The University of California Berkeley. All + rights reserved. +Copyright (c) 2006-2017 The University of Colorado Denver. All rights + reserved. + +$COPYRIGHT$ + +Additional copyrights may follow + +$HEADER$ + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +- Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer listed + in this license in the documentation and/or other materials + provided with the distribution. + +- Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +The copyright holders provide no reassurances that the source code +provided does not infringe any patent, copyright, or any other +intellectual property rights of third parties. The copyright holders +disclaim any liability to any recipient for claims brought against +recipient by any third party for infringement of that parties +intellectual property rights. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 6d0548807bf5479e5b82212f04ba52f0eb9bfb2b Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com> Date: Fri, 19 Jun 2026 19:35:32 +0300 Subject: [PATCH 2/4] Fix Windows builds for 5.x branch. (#1235) Fix Windows builds for 5.x branch by disabling assembler. --- .github/workflows/build_wheels_windows.yml | 8 ++++---- setup.py | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 3899aa46b..df50680a7 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -17,7 +17,7 @@ on: jobs: Build: - runs-on: windows-2025 + runs-on: windows-2022 strategy: fail-fast: false matrix: @@ -65,7 +65,7 @@ jobs: python --version python -m pip install --upgrade pip python -m pip install --upgrade setuptools - python -m pip install cmake==3.24.2 + python -m pip install cmake==4.3.2 python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v shell: cmd @@ -77,14 +77,14 @@ jobs: Test: needs: [Build] - runs-on: windows-2025 + runs-on: windows-2022 defaults: run: shell: cmd strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] platform: [x86, x64] with_contrib: [0, 1] without_gui: [0, 1] diff --git a/setup.py b/setup.py index 025e1b1fc..1b403760d 100755 --- a/setup.py +++ b/setup.py @@ -147,8 +147,11 @@ def main(): # Raw paths relative to sourcetree root. files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]} + # HACK: Disabled generic assembler for now. + # Windows 2025 CI environment does not provide suitable assembler or build is broken in OpenCV MLAS. ci_cmake_generator = ( - ["-G", "Visual Studio 17 2022"] + ["-G", "Visual Studio 17 2022", + "-DCMAKE_ASM_COMPILER="] if os.name == "nt" else ["-G", "Unix Makefiles"] ) From bb0ad281f799681d400cc6bb7624631124648cde Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 29 Jun 2026 09:48:07 +0300 Subject: [PATCH 3/4] Numpy package update for testing on Linux --- .github/workflows/build_wheels_manylinux.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index 126870a1c..0567afe57 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -103,8 +103,9 @@ jobs: env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true MB_PYTHON_VERSION: ${{ matrix.python-version }} - NP_TEST_DEP: numpy==1.19.4 - NP_TEST_DEP_LATEST: numpy==2.2.6 + NP_TEST_DEP_OLD: numpy==1.19.4 + NP_TEST_DEP: numpy==2.2.6 + NP_TEST_DEP_LATEST: numpy==2.5.0 CONFIG_PATH: travis_config.sh PLAT: ${{ matrix.platform }} SDIST: ${{ matrix.build_sdist || 0 }} @@ -122,7 +123,16 @@ jobs: fetch-depth: 0 - name: Setup Environment variables - run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" -o "3.13" == "${{ matrix.python-version }}" -o "3.14" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi + run: | + if [ "3.8" == "${{ matrix.python-version }}" -o "3.9" == "${{ matrix.python-version }}" ] + then + echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_OLD)" >> $GITHUB_ENV + elif [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" -o "3.13" == "${{ matrix.python-version }}" ] + then + echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV + else + echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV + fi - name: Download a wheel accordingly to matrix uses: actions/download-artifact@v4 with: From bb9a3c9f5d9f50fac809991b14398ae88e04eb5d Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 30 Jun 2026 15:50:18 +0300 Subject: [PATCH 4/4] Standard github actions stetps update. --- .github/workflows/build_wheels_macos.yml | 14 +++++++------- .github/workflows/build_wheels_macos_m1.yml | 14 +++++++------- .github/workflows/build_wheels_manylinux.yml | 18 +++++++++--------- .github/workflows/build_wheels_windows.yml | 14 +++++++------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml index 46762d8e2..4a96dd3e3 100644 --- a/.github/workflows/build_wheels_macos.yml +++ b/.github/workflows/build_wheels_macos.yml @@ -55,7 +55,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 with: submodules: false fetch-depth: 0 @@ -69,7 +69,7 @@ jobs: python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v delocate-wheel ${{ github.workspace }}/wheelhouse/opencv* - name: Saving a wheel accordingly to matrix - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }} path: wheelhouse/opencv*.whl @@ -100,12 +100,12 @@ jobs: run: find . -mindepth 1 -delete working-directory: ${{ github.workspace }} - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 with: submodules: true fetch-depth: 0 - name: Download a wheel accordingly to matrix - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }} path: wheelhouse/ @@ -141,7 +141,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: wheels path: wheelhouse/ @@ -171,7 +171,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload all wheels @@ -189,7 +189,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload wheels for opencv_python diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml index c77a87d65..9c8c670f2 100644 --- a/.github/workflows/build_wheels_macos_m1.yml +++ b/.github/workflows/build_wheels_macos_m1.yml @@ -43,7 +43,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 with: submodules: false fetch-depth: 0 @@ -57,7 +57,7 @@ jobs: python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v delocate-wheel ${{ github.workspace }}/wheelhouse/opencv* - name: Saving a wheel accordingly to matrix - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }} path: wheelhouse/opencv*.whl @@ -82,12 +82,12 @@ jobs: run: find . -mindepth 1 -delete working-directory: ${{ github.workspace }} - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 with: submodules: true fetch-depth: 0 - name: Download a wheel accordingly to matrix - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }} path: wheelhouse/ @@ -123,7 +123,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: wheels path: wheelhouse/ @@ -153,7 +153,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload all wheels @@ -171,7 +171,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload wheels for opencv_python diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index 0567afe57..5790ba950 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -71,7 +71,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 with: submodules: false fetch-depth: 0 @@ -79,7 +79,7 @@ jobs: - name: Build a package run: source scripts/build.sh - name: Saving a wheel accordingly to matrix - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: wheel-${{ matrix.platform }}-${{ matrix.manylinux }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }} path: wheelhouse/opencv*.whl @@ -117,7 +117,7 @@ jobs: run: find . -mindepth 1 -delete working-directory: ${{ github.workspace }} - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 with: submodules: true fetch-depth: 0 @@ -134,7 +134,7 @@ jobs: echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV fi - name: Download a wheel accordingly to matrix - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: wheel-${{ matrix.platform }}-${{ matrix.manylinux }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }} path: wheelhouse/ @@ -181,7 +181,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 with: submodules: false fetch-depth: 0 @@ -203,7 +203,7 @@ jobs: set -x echo "skipping tests because of sdist" - name: saving artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }} path: dist/opencv*.tar.gz @@ -217,7 +217,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ @@ -247,7 +247,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ @@ -266,7 +266,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload wheels for opencv_python diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index df50680a7..81098be05 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -46,7 +46,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: submodules: false fetch-depth: 0 @@ -70,7 +70,7 @@ jobs: set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v shell: cmd - name: Saving all wheels - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }} path: wheelhouse/opencv* @@ -102,7 +102,7 @@ jobs: rm -rf ./.??* || true working-directory: ${{ github.workspace }} - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: submodules: true fetch-depth: 0 @@ -112,7 +112,7 @@ jobs: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.platform }} - name: Download a wheel accordingly to matrix - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }} path: wheelhouse/ @@ -142,7 +142,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload wheels for opencv_python_rolling @@ -171,7 +171,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload all wheels @@ -188,7 +188,7 @@ jobs: run: shell: bash steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: path: wheelhouse/ - name: Upload wheels for opencv_python