Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1f45d70

Browse filesBrowse files
committed
Update OpenCV to current 4.x to get PR #20370
1 parent 3dee384 commit 1f45d70
Copy full SHA for 1f45d70

File tree

4 files changed

+13
-8
lines changed
Filter options

4 files changed

+13
-8
lines changed

‎opencv

Copy file name to clipboard
Submodule opencv updated 688 files

‎opencv_contrib

Copy file name to clipboard
Submodule opencv_contrib updated 70 files

‎opencv_extra

Copy file name to clipboard
Submodule opencv_extra updated 186 files

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+10-5Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,6 @@ def main():
129129
+
130130
[
131131
r"python/cv2/.*config.*.py"
132-
]
133-
+
134-
[
135-
r"python/cv2/.*\.pyi"
136132
],
137133
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
138134
("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
@@ -396,7 +392,6 @@ def _classify_installed_files_override(
396392
p.replace(os.path.sep, "/") for p in install_relpaths
397393
]
398394
relpaths_zip = list(zip(fslash_install_relpaths, install_relpaths))
399-
del install_relpaths, fslash_install_relpaths
400395

401396
final_install_relpaths = []
402397

@@ -415,6 +410,16 @@ def _classify_installed_files_override(
415410
with open(config_py, 'w') as opencv_init_config:
416411
opencv_init_config.write(custom_init_data)
417412

413+
for p in fslash_install_relpaths:
414+
if p.endswith(".pyi"):
415+
cls._setuptools_wrap._copy_file(
416+
os.path.join(cmake_install_dir, relpath),
417+
os.path.join(cmake_install_dir, "cv2", "data", relpath),
418+
hide_listing=False,
419+
)
420+
421+
del install_relpaths, fslash_install_relpaths
422+
418423
for package_name, relpaths_re in cls.package_paths_re.items():
419424
package_dest_reldir = package_name.replace(".", os.path.sep)
420425
for relpath_re in relpaths_re:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.