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

Commit cce7c99

Browse files
Merge pull request #1002 from asmorkalov:as/numpy_2.0_v2
Use Numpy 2.0 for Python 3.9+ packages
2 parents 3276dc6 + 00e1209 commit cce7c99

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

‎.github/workflows/build_wheels_linux.yml

Lines changed: 2 additions & 2 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.7']
30+
python-version: ['3.9']
3131
platform: [x64]
3232
with_contrib: [0, 1]
3333
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.26.0
96+
NP_TEST_DEP_LATEST: numpy==2.0.0
9797
CONFIG_PATH: travis_config.sh
9898
PLAT: x86_64
9999
steps:

‎.github/workflows/build_wheels_linux_arm.yml

Lines changed: 2 additions & 2 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.7']
30+
python-version: ['3.9']
3131
platform: [x64]
3232
with_contrib: [0, 1]
3333
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.26.0
97+
NP_TEST_DEP_LATEST: numpy==2.0.0
9898
CONFIG_PATH: travis_config.sh
9999
DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
100100
UNICODE_WIDTH: 32

‎.github/workflows/build_wheels_macos.yml

Lines changed: 2 additions & 2 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.7']
30+
python-version: ['3.9']
3131
platform: [x64]
3232
with_contrib: [0, 1]
3333
without_gui: [0, 1]
@@ -114,7 +114,7 @@ jobs:
114114
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
115115
MB_PYTHON_VERSION: ${{ matrix.python-version }}
116116
NP_TEST_DEP: numpy==1.19.4
117-
NP_TEST_DEP_LATEST: numpy==1.26.0
117+
NP_TEST_DEP_LATEST: numpy==2.0.0
118118
CONFIG_PATH: travis_config.sh
119119
PLAT: x86_64
120120
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata

‎.github/workflows/build_wheels_macos_m1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
python-version: ['3.7']
27+
python-version: ['3.9']
2828
platform: [x64]
2929
with_contrib: [0, 1]
3030
without_gui: [0, 1]

‎.github/workflows/build_wheels_windows.yml

Lines changed: 1 addition & 1 deletion
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.7']
26+
python-version: ['3.9']
2727
platform: [x86, x64]
2828
with_contrib: [0, 1]
2929
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)

AltStyle によって変換されたページ (->オリジナル) /