diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 3899aa46..df50680a 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 025e1b1f..1b403760 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"] )