Skip to content

Try to add pyi files to package #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 10, 2023
Merged

Try to add pyi files to package #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dee384
Try to add pyi files to package.
asmorkalov Jun 1, 2023
e4da6a0
Update OpenCV to current 4.x to get PR #20370
asmorkalov Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opencv
Open in desktop
Submodule opencv updated 688 files
2 changes: 1 addition & 1 deletion opencv_contrib
Open in desktop
Submodule opencv_contrib updated 70 files
+31 −0 .editorconfig
+2 −0 modules/alphamat/include/opencv2/alphamat.hpp
+2 −2 modules/aruco/include/opencv2/aruco/aruco_calib.hpp
+0 −268 modules/aruco/samples/aruco_dict_utils.cpp
+77 −87 modules/aruco/samples/calibrate_camera.cpp
+89 −139 modules/aruco/samples/calibrate_camera_charuco.cpp
+14 −52 modules/aruco/src/aruco.cpp
+18 −420 modules/aruco/src/charuco.cpp
+60 −39 modules/aruco/tutorials/aruco_calibration/aruco_calibration.markdown
+2 −3 modules/aruco/tutorials/aruco_faq/aruco_faq.markdown
+113 −0 modules/barcode/perf/perf_barcode.cpp
+9 −0 modules/barcode/perf/perf_main.cpp
+11 −0 modules/barcode/perf/perf_precomp.hpp
+0 −2 modules/barcode/src/decoder/ean8_decoder.cpp
+0 −9 modules/ccalib/src/ccalib.cpp
+8 −4 modules/ccalib/src/omnidir.cpp
+2 −1 modules/cudacodec/include/opencv2/cudacodec.hpp
+23 −34 modules/cudacodec/src/cuda/nv12_to_rgb.cu
+5 −0 modules/cudacodec/src/ffmpeg_video_source.cpp
+1 −0 modules/cudacodec/src/precomp.hpp
+5 −4 modules/cudacodec/src/video_parser.cpp
+33 −8 modules/cudacodec/src/video_reader.cpp
+96 −1 modules/cudacodec/test/test_video.cpp
+6 −1 modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
+6 −4 modules/cudaimgproc/src/cuda/hough_segments.cu
+15 −9 modules/cudaimgproc/src/hough_segments.cpp
+8 −8 modules/cudalegacy/src/cuda/NCVBroxOpticalFlow.cu
+2 −2 modules/cudawarping/test/test_remap.cpp
+49 −24 modules/cudev/include/opencv2/cudev/ptr2d/texture.hpp
+0 −3 modules/datasets/src/fr_adience.cpp
+0 −2 modules/datasets/src/track_alov.cpp
+0 −2 modules/intensity_transform/src/bimef.cpp
+0 −12 modules/line_descriptor/src/binary_descriptor_matcher.cpp
+0 −2 modules/optflow/src/motempl.cpp
+0 −26 modules/optflow/src/rlof/berlof_invoker.hpp
+0 −3 modules/optflow/src/rlof/geo_interpolation.cpp
+5 −0 modules/optflow/src/rlofflow.cpp
+1 −1 modules/rgbd/samples/linemod.cpp
+0 −6 modules/rgbd/src/nonrigid_icp.cpp
+0 −9 modules/stereo/src/stereo_binary_bm.cpp
+0 −4 modules/stereo/test/test_qds_matching.cpp
+0 −5 modules/structured_light/src/graycodepattern.cpp
+1 −2 modules/surface_matching/src/icp.cpp
+4 −2 modules/text/include/opencv2/text/ocr.hpp
+0 −2 modules/text/src/ocr_beamsearch_decoder.cpp
+0 −2 modules/text/src/ocr_hmm_decoder.cpp
+3 −1 modules/text/src/ocr_tesseract.cpp
+0 −2 modules/text/src/text_detector_swt.cpp
+0 −23 modules/tracking/src/multiTracker.cpp
+0 −16 modules/tracking/src/tldDetector.cpp
+0 −21 modules/tracking/src/tldModel.cpp
+0 −3 modules/tracking/src/tldTracker.cpp
+0 −10 modules/tracking/src/trackerSamplerAlgorithm.cpp
+2 −2 modules/viz/include/opencv2/viz/vizcore.hpp
+21 −0 modules/wechat_qrcode/perf/perf_main.cpp
+15 −0 modules/wechat_qrcode/perf/perf_precomp.hpp
+159 −0 modules/wechat_qrcode/perf/perf_wechat_qrcode_pipeline.cpp
+13 −5 modules/wechat_qrcode/src/zxing/qrcode/decoder/decoded_bit_stream_parser.cpp
+1 −2 modules/wechat_qrcode/src/zxing/qrcode/detector/detector.cpp
+11 −0 modules/wechat_qrcode/test/test_qrcode.cpp
+12 −8 modules/xfeatures2d/src/cuda/surf.cu
+4 −10 modules/xfeatures2d/test/test_surf.cuda.cpp
+30 −7 modules/xfeatures2d/test/test_surf.ocl.cpp
+1 −1 modules/ximgproc/src/brightedges.cpp
+0 −6 modules/ximgproc/src/edge_drawing.cpp
+0 −4 modules/ximgproc/src/fast_hough_transform.cpp
+0 −4 modules/ximgproc/src/find_ellipses.cpp
+1 −3 modules/ximgproc/src/slic.cpp
+0 −4 modules/ximgproc/src/sparse_match_interpolators.cpp
+2 −2 modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp
2 changes: 1 addition & 1 deletion opencv_extra
Open in desktop
Submodule opencv_extra updated 186 files
19 changes: 17 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ def main():
+
[
r"python/cv2/.*config.*.py"
],
]
+
[ r"python/cv2/py.typed" ] if sys.version_info >= (3, 6) else []
,
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
],
Expand Down Expand Up @@ -392,7 +395,6 @@ def _classify_installed_files_override(
p.replace(os.path.sep, "/") for p in install_relpaths
]
relpaths_zip = list(zip(fslash_install_relpaths, install_relpaths))
del install_relpaths, fslash_install_relpaths

final_install_relpaths = []

Expand All @@ -411,6 +413,19 @@ def _classify_installed_files_override(
with open(config_py, 'w') as opencv_init_config:
opencv_init_config.write(custom_init_data)

if sys.version_info >= (3, 6):
for p in install_relpaths:
if p.endswith(".pyi"):
target_rel_path = os.path.relpath(p, "python/cv2")
cls._setuptools_wrap._copy_file(
os.path.join(cmake_install_dir, p),
os.path.join(cmake_install_dir, "cv2", target_rel_path),
hide_listing=False,
)
final_install_relpaths.append(os.path.join("cv2", target_rel_path))

del install_relpaths, fslash_install_relpaths

for package_name, relpaths_re in cls.package_paths_re.items():
package_dest_reldir = package_name.replace(".", os.path.sep)
for relpath_re in relpaths_re:
Expand Down