Skip to content

Commit e4da6a0

Browse files
committed
Update OpenCV to current 4.x to get PR #20370
1 parent 3dee384 commit e4da6a0

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

opencv

Submodule opencv updated 688 files

opencv_contrib

Submodule opencv_contrib updated 70 files

opencv_extra

Submodule opencv_extra updated 186 files

setup.py

+15-4
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,8 @@ def main():
131131
r"python/cv2/.*config.*.py"
132132
]
133133
+
134-
[
135-
r"python/cv2/.*\.pyi"
136-
],
134+
[ r"python/cv2/py.typed" ] if sys.version_info >= (3, 6) else []
135+
,
137136
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
138137
("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
139138
],
@@ -396,7 +395,6 @@ def _classify_installed_files_override(
396395
p.replace(os.path.sep, "/") for p in install_relpaths
397396
]
398397
relpaths_zip = list(zip(fslash_install_relpaths, install_relpaths))
399-
del install_relpaths, fslash_install_relpaths
400398

401399
final_install_relpaths = []
402400

@@ -415,6 +413,19 @@ def _classify_installed_files_override(
415413
with open(config_py, 'w') as opencv_init_config:
416414
opencv_init_config.write(custom_init_data)
417415

416+
if sys.version_info >= (3, 6):
417+
for p in install_relpaths:
418+
if p.endswith(".pyi"):
419+
target_rel_path = os.path.relpath(p, "python/cv2")
420+
cls._setuptools_wrap._copy_file(
421+
os.path.join(cmake_install_dir, p),
422+
os.path.join(cmake_install_dir, "cv2", target_rel_path),
423+
hide_listing=False,
424+
)
425+
final_install_relpaths.append(os.path.join("cv2", target_rel_path))
426+
427+
del install_relpaths, fslash_install_relpaths
428+
418429
for package_name, relpaths_re in cls.package_paths_re.items():
419430
package_dest_reldir = package_name.replace(".", os.path.sep)
420431
for relpath_re in relpaths_re:

0 commit comments

Comments
 (0)