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 d49b948

Browse filesBrowse files
asenyaevasenyaev
authored
Merge pull request opencv#567 from asenyaev/asen/update_3.4
Updated 3.4 branch to 3.4.16 release and added changes from master branch
2 parents d490870 + a16de91 commit d49b948
Copy full SHA for d49b948
Expand file treeCollapse file tree

21 files changed

+152
-507
lines changed

‎.github/workflows/build_wheels_linux.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux.yml
+5-7Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu-latest]
26-
python-version: [3.6, 3.7, 3.8, 3.9]
26+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2727
platform: [x64]
2828
with_contrib: [0, 1]
2929
without_gui: [0, 1]
@@ -38,9 +38,10 @@ jobs:
3838
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
3939
MB_ML_VER: 2014
4040
NP_TEST_DEP: numpy==1.19.4
41+
NP_TEST_DEP_LATEST: numpy==1.21.2
4142
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4243
CONFIG_PATH: travis_config.sh
43-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
44+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
4445
USE_CCACHE: 1
4546
UNICODE_WIDTH: 32
4647
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -63,8 +64,7 @@ jobs:
6364
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
6465
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
6566
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
66-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
67-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
67+
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
6868
6969
- name: build
7070
run: source scripts/build.sh
@@ -107,7 +107,7 @@ jobs:
107107
NP_TEST_DEP: numpy==1.19.4
108108
TRAVIS_BUILD_DIR: ${{ github.workspace }}
109109
CONFIG_PATH: travis_config.sh
110-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
110+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
111111
USE_CCACHE: 1
112112
UNICODE_WIDTH: 32
113113
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -135,8 +135,6 @@ jobs:
135135
run: |
136136
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
137137
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
138-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
139-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
140138
141139
- name: before install
142140
run: |

‎.github/workflows/build_wheels_linux_arm.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux_arm.yml
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ARM64]
26-
python-version: [3.6, 3.7, 3.8, 3.9]
26+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2727
platform: [x64]
2828
with_contrib: [0, 1]
2929
without_gui: [0, 1]
@@ -39,10 +39,11 @@ jobs:
3939
PLAT: aarch64
4040
MB_ML_VER: 2014
4141
NP_TEST_DEP: numpy==1.19.4
42+
NP_TEST_DEP_LATEST: numpy==1.21.2
4243
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4344
CONFIG_PATH: travis_config.sh
44-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
45-
DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
45+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
46+
DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
4647
USE_CCACHE: 0
4748
UNICODE_WIDTH: 32
4849
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -63,8 +64,7 @@ jobs:
6364
- name: Setup Environment variables
6465
run: |
6566
if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
66-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
67-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
67+
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
6868
6969
- name: build
7070
run: source scripts/build.sh

‎.github/workflows/build_wheels_macos.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_macos.yml
+17-13Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,23 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [macos-latest]
26-
python-version: [3.6, 3.7, 3.8, 3.9]
25+
os: [macos-10.15, macos-11]
26+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2727
platform: [x64]
2828
with_contrib: [0, 1]
2929
without_gui: [0, 1]
3030
build_sdist: [0]
31+
exclude:
32+
- os: macos-10.15
33+
python-version: '3.10'
34+
- os: macos-11
35+
python-version: '3.6'
36+
- os: macos-11
37+
python-version: '3.7'
38+
- os: macos-11
39+
python-version: '3.8'
40+
- os: macos-11
41+
python-version: '3.9'
3142

3243
env:
3344
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
@@ -38,9 +49,11 @@ jobs:
3849
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
3950
MB_ML_VER: 2014
4051
NP_TEST_DEP: numpy==1.19.4
52+
NP_TEST_DEP_LATEST: numpy==1.21.2
4153
TRAVIS_BUILD_DIR: ${{ github.workspace }}
54+
TRAVIS_OS_NAME: osx
4255
CONFIG_PATH: travis_config.sh
43-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
56+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
4457
USE_CCACHE: 1
4558
UNICODE_WIDTH: 32
4659
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -58,22 +71,13 @@ jobs:
5871
if: github.event_name == 'pull_request'
5972
run: git submodule update --remote
6073

61-
- name: Set up Python ${{ matrix.python-version }}
62-
uses: actions/setup-python@v2
63-
if: ${{ 'macos-latest' == matrix.os }}
64-
with:
65-
python-version: ${{ matrix.python-version }}
66-
architecture: ${{ matrix.platform }}
67-
6874
- name: Setup Environment variables
6975
run: |
70-
if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
7176
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
7277
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
7378
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
7479
if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
75-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
76-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
80+
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
7781
7882
- name: before install
7983
run: |

‎.github/workflows/build_wheels_macos_m1.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_macos_m1.yml
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
os: [macOS-M1]
23-
python-version: [3.7, 3.8, 3.9]
23+
python-version: ['3.7', '3.8', '3.9', '3.10']
2424
platform: [x64]
2525
with_contrib: [0, 1]
2626
without_gui: [0, 1]
2727
build_sdist: [0]
2828

2929
env:
30+
CI_BUILD: 1
3031
SDIST: ${{ matrix.build_sdist || 0 }}
3132
ENABLE_HEADLESS: ${{ matrix.without_gui }}
3233
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
@@ -50,16 +51,20 @@ jobs:
5051
echo $ENABLE_HEADLESS > headless.enabled
5152
export MACOSX_DEPLOYMENT_TARGET=11.0
5253
arch -arm64 python${{ matrix.python-version }} -m pip wheel --wheel-dir=wheelhouse . --verbose
54+
delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
55+
5356
- name: before test
5457
run: |
5558
git submodule update --init --recursive
5659
arch -arm64 python${{ matrix.python-version }} -m pip install --user --no-cache --force-reinstall wheelhouse/opencv*.whl
5760
cd ${{ github.workspace }}/tests
5861
arch -arm64 python${{ matrix.python-version }} get_build_info.py
62+
5963
- name: run test
6064
run: |
6165
cd ${{ github.workspace }}/opencv
6266
arch -arm64 python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
67+
6368
- name: saving artifacts
6469
uses: actions/upload-artifact@v2
6570
with:

‎.github/workflows/build_wheels_windows.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_windows.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [windows-latest]
25-
python-version: [3.6, 3.7, 3.8, 3.9]
25+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2626
platform: [x86, x64]
2727
with_contrib: [0, 1]
2828
without_gui: [0, 1]

0 commit comments

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