8000 Updated 3.4 branch to 3.4.16 release and added changes from master branch by asenyaev · Pull Request #567 · opencv/opencv-python · GitHub
[go: up one dir, main page]
Skip to content

Updated 3.4 branch to 3.4.16 release and added changes from master branch #567

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

Updated 3.4 branch to 3.4.16 release and added changes from master branch #567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
eb0efe2
Readme update after migration to Github Actions for CI.
asmorkalov Jul 16, 2021
c1cc7e5
Merge pull request #515 from asmorkalov/as/docs_update_actions
sergregory Jul 23, 2021
ecd163d
fix typo in Readme
Skylion007 Sep 17, 2021
f07201c
Merge pull request #545 from Skylion007/patch-1
asmorkalov Sep 20, 2021
5fedf82
Added the lapack installation
asenyaev Sep 21, 2021
3c1ea44
Changed blas to openblas and fixed flow to a proper installation
Oct 1, 2021
40e0e3b
Fixed aarch64 openblas installation
Oct 1, 2021
1d6e034
Fixed an issue when machine:X86 was defined on Windows x64
Oct 1, 2021
76a6fb2
Added fix for MacOS with M1
Oct 6, 2021
3f01089
Removed env variables and defined CI_BUILD variable globally
Oct 6, 2021
4b49e0b
Merge pull request #555 from asenyaev/asen/fix_macos_m1
asenyaev Oct 7, 2021
80f0790
Merge pull request #547 from asenyaev/asen/lapack_issue
asenyaev Oct 7, 2021
d82a270
Updated Github Actions to python 3.10 and fixed following issues
Oct 7, 2021
0114953
Fixed the version of numpy for linux aarch64 and python3.6
Oct 8, 2021
9f43c0b
Changed the image for tests on linux arm
Oct 8, 2021
4d0f6d2
Fixed if condition for numpy test version on linux arm and renamed nu…
Oct 9, 2021
fdcbcb1
Added lowest numpy version support instead of latest
Oct 9, 2021
51226a7
Travis CI seems to be on vacation
cclauss Oct 11, 2021
5c81cda
Fix typo in Readme
andruekonst Oct 13, 2021
69be49c
Merge pull request #556 from asenyaev/asen/upgrade_to_python_3_10
asenyaev Oct 15, 2021
85b9bc5
Merge pull request #558 from cclauss/patch-2
asenyaev Oct 15, 2021
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
7e67ab5
"Programming Language :: Python :: 3.10",
cclauss Oct 16, 2021
851182f
Removed useless lines and added replacing lines into init file
asenyaev Oct 18, 2021
a0f47e9
Merge pull request #563 from asenyaev/asen/python_loader_support
asenyaev Oct 20, 2021
3cd06d9
Merge pull request #565 from cclauss/patch-2
asenyaev Oct 20, 2021
84bfd76
Merge pull request #561 from andruekonst/patch-1
asenyaev Oct 20, 2021
96fbc60
Updated submodules to 3.4.16 Release
asenyaev Oct 20, 2021
5094e4e
3.4.x uses BSD
skvark Jan 3, 2021
c19b05a
update 3.4.x specific parts
skvark Jan 3, 2021
27c1aa4
OpenCV 3.4.16 release preparations
skvark Jan 3, 2021
f947d44
Update years in opencv license according to the original repo (#477)
sergregory May 5, 2021
2e562e9
Added opencv_extra and defined 3.4 branch for submodules
Jun 2, 2021
a16de91
Updated submodules and configs to 3.4.16 Release
asenyaev Oct 20, 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
update 3.4.x specific parts
  • Loading branch information
@skvark @asenyaev
skvark authored and asenyaev committed Oct 20, 2021
commit c19b05aefc717c2d90f0b96f423d06b7492a9ed2
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ On slow systems such as Raspberry Pi the full build may take several hours. On a

Opencv-python package (scripts in this repository) is available under MIT license.

OpenCV itself is available under [Apache 2](https://github.com/opencv/opencv/blob/master/LICENSE) license.
OpenCV itself is available under [3-clause BSD License](https://github.com/opencv/opencv/blob/master/LICENSE).

Third party package licenses are at [LICENSE-3RD-PARTY.txt](https://github.com/opencv/opencv-python/blob/master/LICENSE-3RD-PARTY.txt).

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
7A7B
Original file line numberDiff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def main():
# Path regexes with forward slashes relative to CMake install dir.
rearrange_cmake_output_data = {
"cv2": (
[r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll" % ("_64" if x64 else "")]
[r"bin/opencv_ffmpeg\d{3,4}%s\.dll" % ("_64" if x64 else "")]
if os.name == "nt"
else []
)
Expand All @@ -120,7 +120,7 @@ def main():
r"python/cv2/.*config.*.py"
],
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
("etc" if os.name == "nt" else "share/OpenCV") + r"/haarcascades/.*\.xml"
],
"cv2.gapi": [
"python/cv2" + r"/gapi/.*\.py"
Expand Down
0