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
Appearance settings

Commit 824a3b2

Browse filesBrowse files
asenyaevasenyaev
authored
Merge pull request opencv#584 from asenyaev/asen/upgrade_3.4_again
Update 3.4 branch to the latest changes in master
2 parents 6dfaa9d + 87e4f4d commit 824a3b2
Copy full SHA for 824a3b2

8 files changed

+27
-16
lines changed

‎LICENSE-3RD-PARTY.txt

Copy file name to clipboardExpand all lines: LICENSE-3RD-PARTY.txt
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ This license applies to above binaries in the directory cv2/.
840840
* The implementation was written so as to conform with Netscapes SSL.
841841
*
842842
* This library is free for commercial and non-commercial use as long as
843-
* the following conditions are aheared to. The following conditions
843+
* the following conditions are adhered to. The following conditions
844844
* apply to all code found in this distribution, be it the RC4, RSA,
845845
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
846846
* included with this distribution is covered by the same copyright terms
@@ -865,7 +865,7 @@ This license applies to above binaries in the directory cv2/.
865865
* must display the following acknowledgement:
866866
* "This product includes cryptographic software written by
867867
* Eric Young (eay@cryptsoft.com)"
868-
* The word 'cryptographic' can be left out if the rouines from the library
868+
* The word 'cryptographic' can be left out if the routines from the library
869869
* being used are not cryptographic related :-).
870870
* 4. If you include any Windows specific code (or a derivative thereof) from
871871
* the apps directory (application code) you must include an acknowledgement:
@@ -883,7 +883,7 @@ This license applies to above binaries in the directory cv2/.
883883
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
884884
* SUCH DAMAGE.
885885
*
886-
* The licence and distribution terms for any publically available version or
886+
* The licence and distribution terms for any publicly available version or
887887
* derivative of this code cannot be changed. i.e. this code cannot simply be
888888
* copied and put under another distribution licence
889889
* [including the GNU Public Licence.]

‎MANIFEST.in

Copy file name to clipboardExpand all lines: MANIFEST.in
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ recursive-include docker *
99
recursive-include opencv *
1010
recursive-include opencv_contrib *
1111
recursive-include patches *
12+
recursive-include scripts *.py

‎README.md

Copy file name to clipboardExpand all lines: README.md
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ A: It's easier for users to understand ``opencv-python`` than ``cv2`` and it mak
7979

8080
## Documentation for opencv-python
8181

82-
[![Windows Buld Status](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_windows.yml/badge.svg)](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_windows.yml)
82+
[![Windows Build Status](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_windows.yml/badge.svg)](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_windows.yml)
8383
[![(Linux Build status)](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_linux.yml/badge.svg)](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_linux.yml)
8484
[![(Mac OS Build status)](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_macos.yml/badge.svg)](https://github.com/opencv/opencv-python/actions/workflows/build_wheels_macos.yml)
8585

@@ -220,6 +220,7 @@ Python 3.x compatible pre-built wheels are provided for the officially supported
220220
- 3.7
221221
- 3.8
222222
- 3.9
223+
- 3.10
223224

224225
### Backward compatibility
225226

‎opencv

Copy file name to clipboard

‎patch_auditwheel_whitelist.py

Copy file name to clipboardExpand all lines: patch_auditwheel_whitelist.py
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55

66
policies = None
77

8-
with open(join(dirname(abspath(policy.__file__)), "policy.json")) as f:
8+
with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json")) as f:
99
policies = json.load(f)
1010

1111
for p in policies:
12-
if p["name"] == "manylinux2014":
13-
p["lib_whitelist"].append("libxcb.so.1")
12+
p["lib_whitelist"].append("libxcb.so.1")
1413

15-
with open(join(dirname(abspath(policy.__file__)), "policy.json"), "w") as f:
14+
with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), "w") as f:
1615
f.write(json.dumps(policies))

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+11-1Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,18 @@ def _classify_installed_files_override(
365365

366366
print("Copying files from CMake output")
367367

368+
# lines for a proper work using pylint and an autocomplete in IDE
369+
with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'r') as opencv_init:
370+
opencv_init_lines = opencv_init.readlines()
371+
extra_imports = ('\nfrom .cv2 import *\nfrom . import data\n')
372+
free_line_after_imports = 5
373+
opencv_init_lines.insert(free_line_after_imports, extra_imports)
374+
375+
with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'w') as opencv_final_init:
376+
opencv_final_init.writelines(opencv_init_lines)
377+
368378
# add lines from the old __init__.py file to the config file
369-
with open('scripts/__init__.py', 'r') as custom_init:
379+
with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
370380
custom_init_data = custom_init.read()
371381
with open('%spython/cv2/config-%s.%s.py'
372382
% (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ function build_wheel {
1212

1313
function bdist_wheel_cmd {
1414
# copied from multibuild's common_utils.sh
15-
# add osx deployment target so it doesnt default to 10.6
15+
# add osx deployment target so it doesn't default to 10.6
1616
local abs_wheelhouse=$1
1717
CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
1818
cp dist/*.whl $abs_wheelhouse
1919
if [ -z "$IS_OSX" ]; then
20-
TOOLS_PATH=/opt/_internal/tools
21-
/opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
20+
# this path can be changed in the latest manylinux image
21+
TOOLS_PATH=/opt/_internal/pipx/venvs/auditwheel
22+
/opt/python/cp39-cp39/bin/python -m venv $TOOLS_PATH
2223
source $TOOLS_PATH/bin/activate
23-
python$PYTHON_VERSION -m pip install auditwheel==3.2.0
24-
python$PYTHON_VERSION patch_auditwheel_whitelist.py
24+
python patch_auditwheel_whitelist.py
2525
# to avoid issues with numpy wheels
2626
rm /io/wheelhouse/numpy*
2727
deactivate

‎travis_osx_brew_cache.sh

Copy file name to clipboardExpand all lines: travis_osx_brew_cache.sh
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function _brew_install_and_cache_within_time_limit {
249249
for dep in $DEPS; do
250250
#TIME_LIMIT only has to be met if we'll be actually building the main project this iteration, i.e. after the "root" module installation
251251
#While we don't know that yet, we can make better use of Travis-given time with a laxer limit
252-
#We still can't overrun TIME_HARD_LIMIT as that would't leave time to save the cache
252+
#We still can't overrun TIME_HARD_LIMIT as that wouldn't leave time to save the cache
253253
_brew_install_and_cache_within_time_limit "$dep" $(((TIME_LIMIT+TIME_HARD_LIMIT)/2)) "$TIME_HARD_LIMIT" "$TIME_START" || return $?
254254
done
255255

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.