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

Update master branch for 4.6.0 release

.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*'

.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*'

.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*'

.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*'

.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*'

opencv @ b0dc4741

-Subproject commit dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2
+Subproject commit b0dc474160e389b9c9045da5db49d03ae17c6a6b

opencv_contrib @ db16caf6

-Subproject commit 49e8f123ca08e76891856a1ecce491b62d08ba20
+Subproject commit db16caf6ceee76b43b94c846be276e92a43e9700

opencv_extra @ 936854e2

-Subproject commit 37294e3c876a72c992d4718b9bbfc8346b9e779a
+Subproject commit 936854e2b666853d6d0732a8eabc2d699f4fa3d8

setup.py

@@ -374,21 +374,6 @@ class RearrangeCMakeOutput(object):
 
         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()