diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index a1a36ff8..8bd9c5ef 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -19,7 +19,7 @@ on: jobs: Build: - runs-on: windows-2019 + runs-on: windows-2025 strategy: fail-fast: false matrix: @@ -48,7 +48,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false fetch-depth: 0 @@ -61,16 +61,18 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: Setup NASM uses: ilammy/setup-nasm@v1 + - name: Build a package # CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version run: | 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 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 + - name: Saving all wheels uses: actions/upload-artifact@v4 with: @@ -79,7 +81,7 @@ jobs: Test: needs: [Build] - runs-on: windows-2019 + runs-on: windows-2025 defaults: run: shell: cmd @@ -103,10 +105,11 @@ jobs: rm -rf ./.??* || true working-directory: ${{ github.workspace }} - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/multibuild b/multibuild index 0714f52e..24f1446f 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 0714f52ea1ea57a0bc33c7f8b74bae457e1fa8e0 +Subproject commit 24f1446f6477893b2ef9d721aabcee7a494ca2b1 diff --git a/opencv b/opencv index 31b0eeea..b395a2e3 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 31b0eeea0b44b370fd0712312df4214d4ae1b158 +Subproject commit b395a2e307e9b44c394b6f0e46de319a93ef85d4 diff --git a/opencv_contrib b/opencv_contrib index 0e5254eb..1e4d4e0f 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit 0e5254ebf54d2aed6e7eaf6660bf3b797cf50a02 +Subproject commit 1e4d4e0f3e4c7d6d7ab9d738026fe13d3cd85cf4 diff --git a/opencv_extra b/opencv_extra index a74cf6ba..8926a390 160000 --- a/opencv_extra +++ b/opencv_extra @@ -1 +1 @@ -Subproject commit a74cf6bae7fd75d91282b877c559168b3a62148a +Subproject commit 8926a3906a44733d68485c703de1c8a765577246 diff --git a/setup.py b/setup.py index 9aff8d23..084123b3 100755 --- a/setup.py +++ b/setup.py @@ -161,16 +161,9 @@ def main(): # Files in sourcetree outside package dir that should be copied to package. # Raw paths relative to sourcetree root. files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]} - - ci_cmake_generator = ( - ["-G", "Visual Studio 14" + (" Win64" if is64 else "")] - if os.name == "nt" - else ["-G", "Unix Makefiles"] - ) - + cmake_args = ( - (ci_cmake_generator if is_CI_build else []) - + [ + [ # skbuild inserts PYTHON_* vars. That doesn't satisfy opencv build scripts in case of Py3 "-DPYTHON3_EXECUTABLE=%s" % sys.executable, "-DPYTHON_DEFAULT_EXECUTABLE=%s" % sys.executable,