Skip to content

Updated submodules to the release 4.5.4 and added python loader support #563

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 3 commits into from
Oct 20, 2021
Merged

Updated submodules to the release 4.5.4 and added python loader support #563

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a1f61b
Updated submodules to the release 4.5.4, added python loader support,…
asenyaev Oct 15, 2021
545fe24
Added comments for new changes
asenyaev Oct 15, 2021
851182f
Removed useless lines and added replacing lines into init file
asenyaev Oct 18, 2021
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
Prev Previous commit
Next Next commit
Added comments for new changes
  • Loading branch information
@asenyaev
asenyaev committed Oct 15, 2021
commit 545fe24728bfee7e0092d0e37dbdd0371bb1c2d8
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ def _classify_installed_files_override(

print("Copying files from CMake output")

# need for the proper import of a package
with open('%spython/cv2/__init__.py'
% cmake_install_dir, 'r') as opencv_init:
opencv_init_data = ""
Expand All @@ -386,6 +387,7 @@ def _classify_installed_files_override(
% cmake_install_dir, 'w') as opencv_python_init:
opencv_python_init.write(opencv_init_data)

# add lines from the old __init__.py file to the config file
with open('scripts/__init__.py', 'r') as custom_init:
custom_init_data = custom_init.read()
with open('%spython/cv2/config-%s.%s.py'
Expand Down