Merge pull request #668 from asenyaev/asen/check_latest_commits_4.x

Update master branch for 4.6.0 release
opencv · Jun 6, 2022 · b45a6a9 · b45a6a9
2 parents f2f924c + 04b1a52
commit b45a6a9
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - 3.4
     paths-ignore:
       - '.github/workflows/build_wheels_linux_arm.yml'
       - '.github/workflows/build_wheels_windows*'

diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - 3.4
     paths-ignore:
       - '.github/workflows/build_wheels_linux.yml'
       - '.github/workflows/build_wheels_windows*'

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - 3.4
     paths-ignore:
       - '.github/workflows/build_wheels_linux*'
       - '.github/workflows/build_wheels_windows*'

diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - 3.4
     paths-ignore:
       - '.github/workflows/build_wheels_linux*'
       - '.github/workflows/build_wheels_windows*'

diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - 3.4
     paths-ignore:
       - '.github/workflows/build_wheels_linux*'
       - '.github/workflows/build_wheels_macos*'

diff --git a/opencv b/opencv
diff --git a/opencv_contrib b/opencv_contrib
diff --git a/opencv_extra b/opencv_extra
diff --git a/setup.py b/setup.py
@@ -374,21 +374,6 @@ def _classify_installed_files_override(
 
         print("Copying files from CMake output")
 
-        # lines for a proper work using pylint and an autocomplete in IDE
-        with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'r') as opencv_init:
-            opencv_init_lines = opencv_init.readlines()
-            extra_imports = ('\nfrom .cv2 import *\nfrom .cv2 import _registerMatType\nfrom . import mat_wrapper\nfrom . import gapi'
-                             '\nfrom . import misc\nfrom . import utils\nfrom . import data\nfrom . import version\n')
-            free_line_after_imports = 6
-            opencv_init_lines.insert(free_line_after_imports, extra_imports)
-            opencv_init_data = ""
-            for line in opencv_init_lines:
-                opencv_init_replacement = line.replace('importlib.import_module("cv2")', 'importlib.import_module("cv2.cv2")')
-                opencv_init_data = opencv_init_data + opencv_init_replacement
-
-        with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'w') as opencv_final_init:
-            opencv_final_init.write(opencv_init_data)
-
         # add lines from the old __init__.py file to the config file
         with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
             custom_init_data = custom_init.read()
+ −		testdata/cv/aruco/recover.png
+ −		testdata/cv/aruco/regression_2492.png
+ −		testdata/cv/aruco/regression_3192.png
+ −		testdata/cv/aruco/trivial_board_detection.png
+ −		testdata/cv/qrcode/issue_21287.png
+3 −3		testdata/dnn/download_models.py
+ −		testdata/dnn/onnx/data/input_dynamic_resize_13_0.npy
+ −		testdata/dnn/onnx/data/input_dynamic_resize_13_1.npy
+ −		testdata/dnn/onnx/data/input_dynamic_resize_scale_13_0.npy
+ −		testdata/dnn/onnx/data/input_dynamic_resize_scale_13_1.npy
+ −		testdata/dnn/onnx/data/input_lstm_cell_bidirectional.npy
+ −		testdata/dnn/onnx/data/input_lstm_cell_forward.npy
+ −		testdata/dnn/onnx/data/input_lstm_cell_with_peepholes.npy
+ −		testdata/dnn/onnx/data/input_output_registration_0.npy
+ −		testdata/dnn/onnx/data/input_output_registration_1.npy
+ −		testdata/dnn/onnx/data/input_quantized_conv_asymmetric_pads_int8_weights.npy
+ −		testdata/dnn/onnx/data/input_resize_size_opset11.npy
+ −		testdata/dnn/onnx/data/input_resize_size_opset13.npy
+ −		testdata/dnn/onnx/data/input_slice_neg_starts.npy
+ −		testdata/dnn/onnx/data/output_dynamic_resize_13.npy
+ −		testdata/dnn/onnx/data/output_dynamic_resize_scale_13.npy
+ −		testdata/dnn/onnx/data/output_lstm_cell_bidirectional.npy
+ −		testdata/dnn/onnx/data/output_lstm_cell_forward.npy
+ −		testdata/dnn/onnx/data/output_lstm_cell_with_peepholes.npy
+ −		testdata/dnn/onnx/data/output_output_registration.npy
+ −		testdata/dnn/onnx/data/output_quantized_conv_asymmetric_pads_int8_weights.npy
+ −		testdata/dnn/onnx/data/output_resize_size_opset11.npy
+ −		testdata/dnn/onnx/data/output_resize_size_opset13.npy
+ −		testdata/dnn/onnx/data/output_slice_neg_starts.npy
+104 −8		testdata/dnn/onnx/generate_onnx_models.py
+ −		testdata/dnn/onnx/models/dynamic_resize_13.onnx
+ −		testdata/dnn/onnx/models/dynamic_resize_scale_13.onnx
+ −		testdata/dnn/onnx/models/lstm_cell_bidirectional.onnx
+ −		testdata/dnn/onnx/models/lstm_cell_forward.onnx
+ −		testdata/dnn/onnx/models/lstm_cell_with_peepholes.onnx
+22 −0		testdata/dnn/onnx/models/output_registration.onnx
+ −		testdata/dnn/onnx/models/quantized_conv_asymmetric_pads_int8_weights.onnx
+ −		testdata/dnn/onnx/models/resize_size_opset11.onnx
+ −		testdata/dnn/onnx/models/resize_size_opset13.onnx
+ −		testdata/dnn/onnx/models/slice_neg_starts.onnx
+ −		testdata/gpu/connectedcomponents/ccomp_exp.png
+ −		testdata/gpu/connectedcomponents/concentric_circles.png
+ −		testdata/highgui/readwrite/BigTIFF.tif
+ −		testdata/highgui/readwrite/BigTIFFLong.tif
+ −		testdata/highgui/readwrite/BigTIFFLong8.tif
+ −		testdata/highgui/readwrite/BigTIFFLong8Tiles.tif
+ −		testdata/highgui/readwrite/BigTIFFMotorola.tif
+ −		testdata/highgui/readwrite/BigTIFFMotorolaLongStrips.tif
+ −		testdata/highgui/readwrite/BigTIFFSubIFD4.tif
+ −		testdata/highgui/readwrite/BigTIFFSubIFD8.tif
+ −		testdata/highgui/readwrite/Classic.tif
+ −		testdata/highgui/readwrite/gray_8u.tif
+ −		testdata/highgui/readwrite/pattern_10uc1.tif
+ −		testdata/highgui/readwrite/pattern_10uc3.tif
+ −		testdata/highgui/readwrite/pattern_10uc4.tif
+ −		testdata/highgui/readwrite/pattern_12uc1.tif
+ −		testdata/highgui/readwrite/pattern_12uc3.tif
+ −		testdata/highgui/readwrite/pattern_12uc4.tif
+ −		testdata/highgui/readwrite/pattern_14uc1.tif
+ −		testdata/highgui/readwrite/pattern_14uc3.tif
+ −		testdata/highgui/readwrite/pattern_14uc4.tif
+ −		testdata/highgui/readwrite/pattern_16uc1.tif
+ −		testdata/highgui/readwrite/pattern_16uc3.tif
+ −		testdata/highgui/readwrite/pattern_16uc4.tif
+ −		testdata/highgui/readwrite/pattern_8uc1.tif
+ −		testdata/highgui/readwrite/pattern_8uc3.tif
+ −		testdata/highgui/readwrite/pattern_8uc4.tif