Skip to content

Commit 5f13a4f

Browse files
asmorkalovasmorkalov
committed
Pre-4.7.0 check.
1 parent 7ebbdc3 commit 5f13a4f

12 files changed

+29
-22
lines changed

‎.github/workflows/build_wheels_linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
python-version: ['3.6']
30+
python-version: ['3.7']
3131
platform: [x64]
3232
with_contrib: [0, 1]
3333
without_gui: [0, 1]
@@ -84,7 +84,7 @@ jobs:
8484
strategy:
8585
fail-fast: false
8686
matrix:
87-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
87+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
8888
platform: [x64]
8989
with_contrib: [0, 1]
9090
without_gui: [0, 1]
@@ -93,7 +93,7 @@ jobs:
9393
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
9494
MB_PYTHON_VERSION: ${{ matrix.python-version }}
9595
NP_TEST_DEP: numpy==1.19.4
96-
NP_TEST_DEP_LATEST: numpy==1.21.2
96+
NP_TEST_DEP_LATEST: numpy==1.24.0
9797
CONFIG_PATH: travis_config.sh
9898
PLAT: x86_64
9999
steps:
@@ -106,7 +106,7 @@ jobs:
106106
submodules: true
107107
fetch-depth: 0
108108
- name: Setup Environment variables
109-
run: 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
109+
run: if [ "3.11" == "${{ 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
110110
- name: Download a wheel accordingly to matrix
111111
uses: actions/download-artifact@v3
112112
with:

‎.github/workflows/build_wheels_linux_arm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
python-version: ['3.6']
30+
python-version: ['3.7']
3131
platform: [x64]
3232
with_contrib: [0, 1]
3333
without_gui: [0, 1]
@@ -84,7 +84,7 @@ jobs:
8484
strategy:
8585
fail-fast: false
8686
matrix:
87-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
87+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
8888
platform: [x64]
8989
with_contrib: [0, 1]
9090
without_gui: [0, 1]
@@ -94,7 +94,7 @@ jobs:
9494
MB_PYTHON_VERSION: ${{ matrix.python-version }}
9595
PLAT: aarch64
9696
NP_TEST_DEP: numpy==1.19.4
97-
NP_TEST_DEP_LATEST: numpy==1.21.4
97+
NP_TEST_DEP_LATEST: numpy==1.24.0
9898
CONFIG_PATH: travis_config.sh
9999
DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
100100
UNICODE_WIDTH: 32
@@ -108,7 +108,7 @@ jobs:
108108
submodules: true
109109
fetch-depth: 0
110110
- name: Setup Environment variables
111-
run: 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
111+
run: if [ "3.11" == "${{ 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
112112
- name: Download a wheel accordingly to matrix
113113
uses: actions/download-artifact@v3
114114
with:

‎.github/workflows/build_wheels_macos.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
python-version: ['3.6']
30+
python-version: ['3.7']
3131
platform: [x64]
3232
with_contrib: [0, 1]
3333
without_gui: [0, 1]
@@ -58,6 +58,13 @@ jobs:
5858
if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
5959
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
6060
fi
61+
# hack for image issue on mac: https://github.com/actions/runner-images/issues/6817
62+
rm /usr/local/bin/2to3*
63+
rm /usr/local/bin/idle3*
64+
rm /usr/local/bin/pydoc3*
65+
rm /usr/local/bin/python3*
66+
rm /usr/local/bin/python3*-config
67+
# end hack
6168
- name: Checkout
6269
uses: actions/checkout@v3
6370
with:
@@ -100,7 +107,7 @@ jobs:
100107
strategy:
101108
fail-fast: false
102109
matrix:
103-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
110+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
104111
platform: [x64]
105112
with_contrib: [0, 1]
106113
without_gui: [0, 1]
@@ -109,7 +116,7 @@ jobs:
109116
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
110117
MB_PYTHON_VERSION: ${{ matrix.python-version }}
111118
NP_TEST_DEP: numpy==1.19.4
112-
NP_TEST_DEP_LATEST: numpy==1.21.4
119+
NP_TEST_DEP_LATEST: numpy==1.24.0
113120
CONFIG_PATH: travis_config.sh
114121
PLAT: x86_64
115122
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
@@ -129,7 +136,7 @@ jobs:
129136
python-version: ${{ matrix.python-version }}
130137
architecture: ${{ matrix.platform }}
131138
- name: Setup Environment variables
132-
run: 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
139+
run: if [ "3.11" == "${{ 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
133140
- name: Download a wheel accordingly to matrix
134141
uses: actions/download-artifact@v3
135142
with:

‎.github/workflows/build_wheels_macos_m1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
strategy:
7676
fail-fast: false
7777
matrix:
78-
python-version: ['3.7', '3.8', '3.9', '3.10']
78+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
7979
platform: [x64]
8080
with_contrib: [0, 1]
8181
without_gui: [0, 1]

‎.github/workflows/build_wheels_windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
python-version: ['3.6']
26+
python-version: ['3.7']
2727
platform: [x86, x64]
2828
with_contrib: [0, 1]
2929
without_gui: [0, 1]
@@ -89,7 +89,7 @@ jobs:
8989
strategy:
9090
fail-fast: false
9191
matrix:
92-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
92+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
9393
platform: [x86, x64]
9494
with_contrib: [0, 1]
9595
without_gui: [0, 1]

‎multibuild

‎opencv

Submodule opencv updated 263 files

‎opencv_contrib

Submodule opencv_contrib updated 121 files

‎opencv_extra

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ requires = [
33
"setuptools==59.2.0", "wheel==0.37.0", "cmake>=3.1", "pip",
44
"scikit-build>=0.13.2",
55
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
6-
"numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
6+
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
77
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
88
"numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
99
"numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def main():
2525

2626
install_requires = [
2727
'numpy>=1.13.3; python_version<"3.7"',
28-
'numpy>=1.14.5; python_version>="3.7"',
28+
'numpy>=1.17.0; python_version>="3.7"', # https://github.com/numpy/numpy/pull/13725
2929
'numpy>=1.17.3; python_version>="3.8"',
3030
'numpy>=1.19.3; python_version>="3.9"',
3131
'numpy>=1.21.2; python_version>="3.10"',

‎travis_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function run_tests {
143143

144144
echo "Running for linux"
145145

146-
if [ $PYTHON == "python3.6" ]; then
146+
if [ $PYTHON == "python3.7" ]; then
147147
$PYTHON -m pip install -U numpy==1.19.4
148148
fi
149149
cd /io/tests

0 commit comments

Comments
 (0)