Repository navigation
fix: stop using scikit-build internals - #1274
Merged
Merged
Conversation
Build the cv2 package layout in a CMake install step, added through OpenCV's OPENCV_CMAKE_HOOKS_DIR, and keep only those files with cmake_process_manifest_hook. This replaces the monkeypatch of skbuild.setuptools_wrap._classify_installed_files. Get the Python paths from sysconfig instead of skbuild.cmaker.CMaker. Both are gone in scikit-build 1.0. Fixes opencv#1250. Assisted-by: ClaudeCode:claude-opus-5-5
asmorkalov
approved these changes
Nov 11, 2026
Collaborator
|
Checked linux and windows packages manually. Looks good. |
Collaborator
|
@henryiii Thanks a lot for the contribution! Could you submit similar PR to the 5.x branch too? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a minimal change just moving the parts that are monkey patched so scikit-build (classic) will work after the 1.0 release. Another option would be to move to sciit-build-core, but that changes a bit more (and I think builds on this pretty well).
🤖 AI text below 🤖
Fixes #1250.
setup.pymonkeypatchedskbuild.setuptools_wrap._classify_installed_filesand usedskbuild.cmaker.CMaker. scikit-build 1.0 (now based on scikit-build-core) removes both. This PR removes that dependency and keeps the wheel layout the same:cv2package under<prefix>/cv2, with the same rules as the old regexes. OpenCV'sOPENCV_CMAKE_HOOKS_DIR(POST_FINALIZEhook) adds it, so theopencvsubmodule is not changed. Required files still fail the build if missing.cmake_process_manifest_hookkeeps onlycv2/**from the install.sysconfig.This works with scikit-build 0.x and 1.0. I built headless wheels locally on macOS arm64 (Python 3.12) with scikit-build 0.19.1 before and after the change, and with 1.0.0rc1 after. The file lists and contents match, except for the compiled module and the generated
cv2/typing/__init__.py(the import order changes from build to build). I did not test Windows (ffmpeg DLL,python3XY.lib) or the Linux Qt plugins and fonts locally.