Skip to content

Commit fa742a4

Browse files
asmorkalovasmorkalov
authored
Merge pull request opencv#1119 from asmorkalov:as/numpy_dependency
Updated numpy dependencies.
2 parents 9cd2513 + 7a9ed05 commit fa742a4

File tree

7 files changed

+10
-29
lines changed

7 files changed

+10
-29
lines changed

‎.github/workflows/build_wheels_linux.yml‎

Lines changed: 1 addition & 3 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:
@@ -88,7 +86,7 @@ jobs:
8886
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
8987
MB_PYTHON_VERSION: ${{ matrix.python-version }}
9088
NP_TEST_DEP: numpy==1.19.4
91-
NP_TEST_DEP_LATEST: numpy==2.2.1
89+
NP_TEST_DEP_LATEST: numpy==2.2.6
9290
CONFIG_PATH: travis_config.sh
9391
PLAT: x86_64
9492
steps:

‎.github/workflows/build_wheels_linux_arm.yml‎

Lines changed: 1 addition & 3 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:
@@ -89,7 +87,7 @@ jobs:
8987
MB_PYTHON_VERSION: ${{ matrix.python-version }}
9088
PLAT: aarch64
9189
NP_TEST_DEP: numpy==1.19.4
92-
NP_TEST_DEP_LATEST: numpy==2.2.1
90+
NP_TEST_DEP_LATEST: numpy==2.2.6
9391
CONFIG_PATH: travis_config.sh
9492
DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
9593
UNICODE_WIDTH: 32

‎.github/workflows/build_wheels_macos.yml‎

Lines changed: 1 addition & 3 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:
@@ -109,7 +107,7 @@ jobs:
109107
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
110108
MB_PYTHON_VERSION: ${{ matrix.python-version }}
111109
NP_TEST_DEP: numpy==1.19.4
112-
NP_TEST_DEP_LATEST: numpy==2.2.1
110+
NP_TEST_DEP_LATEST: numpy==2.2.6
113111
CONFIG_PATH: travis_config.sh
114112
PLAT: x86_64
115113
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata

‎.github/workflows/build_wheels_macos_m1.yml‎

Lines changed: 0 additions & 2 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:

‎.github/workflows/build_wheels_windows.yml‎

Lines changed: 0 additions & 2 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:

‎pyproject.toml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
[build-system]
22
requires = [
3-
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
4-
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
5-
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
6-
"numpy==1.19.3; python_version<'3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
7-
"numpy==1.21.0; python_version<'3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
8-
"numpy>=2.0.0; python_version>='3.9'",
3+
"numpy<2.0; python_version<'3.9'",
4+
"numpy==2.0.2; python_version>='3.9' and python_version<'3.13'",
5+
"numpy==2.1.3; python_version=='3.13'",
96
"packaging",
107
"pip",
118
"scikit-build>=0.14.0",

‎setup.py‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,11 @@ def main():
2222
build_java = "ON" if get_build_env_var_by_name("java") else "OFF"
2323
build_rolling = get_build_env_var_by_name("rolling")
2424

25+
# NOTE: since 2.3.0 numpy upgraded from manylinux2014 to manylinux_2_28
26+
# see https://numpy.org/doc/stable/release/2.3.0-notes.html#numpy-2-3-0-release-notes
2527
install_requires = [
26-
'numpy>=1.13.3; python_version<"3.7"',
27-
'numpy>=1.17.0; python_version>="3.7"', # https://github.com/numpy/numpy/pull/13725
28-
'numpy>=1.17.3; python_version>="3.8"',
29-
'numpy>=1.19.3; python_version>="3.9"',
30-
'numpy>=1.21.2; python_version>="3.10"',
31-
'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
32-
'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
33-
'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
34-
"numpy>=1.23.5; python_version>='3.11'",
35-
"numpy>=1.26.0; python_version>='3.12'"
28+
'numpy<2.0; python_version<"3.9"',
29+
'numpy(>=2, <2.3.0); python_version>="3.9"',
3630
]
3731

3832
python_version = cmaker.CMaker.get_python_version()

0 commit comments

Comments
 (0)