Skip to content

Commit c440c71

Browse files
committed
Use Numpy 2.0 for Python 3.9+ packages.
1 parent 3276dc6 commit c440c71

File tree

6 files changed

+11
-25
lines changed

6 files changed

+11
-25
lines changed

.github/workflows/build_wheels_linux.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: Linux x86_64
33
on:
44
pull_request:
55
branches:
6-
- master
7-
- 3.4
86
- 4.x
97
- 5.x
108
paths-ignore:
@@ -27,7 +25,7 @@ jobs:
2725
strategy:
2826
fail-fast: false
2927
matrix:
30-
python-version: ['3.7']
28+
python-version: ['3.7', '3.9']
3129
platform: [x64]
3230
with_contrib: [0, 1]
3331
without_gui: [0, 1]
@@ -93,7 +91,7 @@ jobs:
9391
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
9492
MB_PYTHON_VERSION: ${{ matrix.python-version }}
9593
NP_TEST_DEP: numpy==1.19.4
96-
NP_TEST_DEP_LATEST: numpy==1.26.0
94+
NP_TEST_DEP_LATEST: numpy==2.0.0
9795
CONFIG_PATH: travis_config.sh
9896
PLAT: x86_64
9997
steps:

.github/workflows/build_wheels_linux_arm.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: Linux ARM64
33
on:
44
pull_request:
55
branches:
6-
- master
7-
- 3.4
86
- 4.x
97
- 5.x
108
paths-ignore:
@@ -27,7 +25,7 @@ jobs:
2725
strategy:
2826
fail-fast: false
2927
matrix:
30-
python-version: ['3.7']
28+
python-version: ['3.7', '3.9']
3129
platform: [x64]
3230
with_contrib: [0, 1]
3331
without_gui: [0, 1]
@@ -94,7 +92,7 @@ jobs:
9492
MB_PYTHON_VERSION: ${{ matrix.python-version }}
9593
PLAT: aarch64
9694
NP_TEST_DEP: numpy==1.19.4
97-
NP_TEST_DEP_LATEST: numpy==1.26.0
95+
NP_TEST_DEP_LATEST: numpy==2.0.0
9896
CONFIG_PATH: travis_config.sh
9997
DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
10098
UNICODE_WIDTH: 32

.github/workflows/build_wheels_macos.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: macOS x86_64
33
on:
44
pull_request:
55
branches:
6-
- master
7-
- 3.4
86
- 4.x
97
- 5.x
108
paths-ignore:
@@ -27,7 +25,7 @@ jobs:
2725
strategy:
2826
fail-fast: false
2927
matrix:
30-
python-version: ['3.7']
28+
python-version: ['3.7', '3.9']
3129
platform: [x64]
3230
with_contrib: [0, 1]
3331
without_gui: [0, 1]
@@ -114,7 +112,7 @@ jobs:
114112
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
115113
MB_PYTHON_VERSION: ${{ matrix.python-version }}
116114
NP_TEST_DEP: numpy==1.19.4
117-
NP_TEST_DEP_LATEST: numpy==1.26.0
115+
NP_TEST_DEP_LATEST: numpy==2.0.0
118116
CONFIG_PATH: travis_config.sh
119117
PLAT: x86_64
120118
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata

.github/workflows/build_wheels_macos_m1.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: macOS ARM64
33
on:
44
pull_request:
55
branches:
6-
- master
7-
- 3.4
86
- 4.x
97
- 5.x
108
paths-ignore:
@@ -24,7 +22,7 @@ jobs:
2422
strategy:
2523
fail-fast: false
2624
matrix:
27-
python-version: ['3.7']
25+
python-version: ['3.7', '3.9']
2826
platform: [x64]
2927
with_contrib: [0, 1]
3028
without_gui: [0, 1]

.github/workflows/build_wheels_windows.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: Windows x86_64
33
on:
44
pull_request:
55
branches:
6-
- master
7-
- 3.4
86
- 4.x
97
- 5.x
108
paths-ignore:
@@ -23,7 +21,7 @@ jobs:
2321
strategy:
2422
fail-fast: false
2523
matrix:
26-
python-version: ['3.7']
24+
python-version: ['3.7', '3.9']
2725
platform: [x86, x64]
2826
with_contrib: [0, 1]
2927
without_gui: [0, 1]

pyproject.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ requires = [
44
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
55
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
66
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
7-
"numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
8-
"numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
9-
"numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
10-
"numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
11-
"numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
12-
"numpy==1.23.5; python_version=='3.11'",
13-
"numpy>=1.26.4; python_version>='3.12'",
7+
"numpy==1.19.3; python_version<'3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
8+
"numpy==1.21.0; python_version<'3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
9+
"numpy==2.0.0; python_version>='3.9'",
1410
"pip",
1511
"scikit-build>=0.14.0",
1612
"setuptools==59.2.0",

0 commit comments

Comments
 (0)