Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitb45a6a9

Browse files
authored
Merge pull request#668 from asenyaev/asen/check_latest_commits_4.x
Update master branch for 4.6.0 release
2 parentsf2f924c +04b1a52 commitb45a6a9

9 files changed

+8
-18
lines changed

‎.github/workflows/build_wheels_linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
-master
7+
-3.4
78
paths-ignore:
89
-'.github/workflows/build_wheels_linux_arm.yml'
910
-'.github/workflows/build_wheels_windows*'

‎.github/workflows/build_wheels_linux_arm.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
-master
7+
-3.4
78
paths-ignore:
89
-'.github/workflows/build_wheels_linux.yml'
910
-'.github/workflows/build_wheels_windows*'

‎.github/workflows/build_wheels_macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
-master
7+
-3.4
78
paths-ignore:
89
-'.github/workflows/build_wheels_linux*'
910
-'.github/workflows/build_wheels_windows*'

‎.github/workflows/build_wheels_macos_m1.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
-master
7+
-3.4
78
paths-ignore:
89
-'.github/workflows/build_wheels_linux*'
910
-'.github/workflows/build_wheels_windows*'

‎.github/workflows/build_wheels_windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
-master
7+
-3.4
78
paths-ignore:
89
-'.github/workflows/build_wheels_linux*'
910
-'.github/workflows/build_wheels_macos*'

‎opencv

Submoduleopencv updated641 files

‎opencv_contrib

Submoduleopencv_contrib updated120 files

‎opencv_extra

Submoduleopencv_extra updated67 files

‎setup.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -374,21 +374,6 @@ def _classify_installed_files_override(
374374

375375
print("Copying files from CMake output")
376376

377-
# lines for a proper work using pylint and an autocomplete in IDE
378-
withopen(os.path.join(cmake_install_dir,"python","cv2","__init__.py"),'r')asopencv_init:
379-
opencv_init_lines=opencv_init.readlines()
380-
extra_imports= ('\nfrom .cv2 import *\nfrom .cv2 import _registerMatType\nfrom . import mat_wrapper\nfrom . import gapi'
381-
'\nfrom . import misc\nfrom . import utils\nfrom . import data\nfrom . import version\n')
382-
free_line_after_imports=6
383-
opencv_init_lines.insert(free_line_after_imports,extra_imports)
384-
opencv_init_data=""
385-
forlineinopencv_init_lines:
386-
opencv_init_replacement=line.replace('importlib.import_module("cv2")','importlib.import_module("cv2.cv2")')
387-
opencv_init_data=opencv_init_data+opencv_init_replacement
388-
389-
withopen(os.path.join(cmake_install_dir,"python","cv2","__init__.py"),'w')asopencv_final_init:
390-
opencv_final_init.write(opencv_init_data)
391-
392377
# add lines from the old __init__.py file to the config file
393378
withopen(os.path.join(os.path.dirname(os.path.abspath(__file__)),'scripts','__init__.py'),'r')ascustom_init:
394379
custom_init_data=custom_init.read()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp