Movatterモバイル変換

[0]ホーム
URL:

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

Updated numpy dependencies.#1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
asmorkalov merged 1 commit intoopencv:4.xfromasmorkalov:as/numpy_dependency
Jul 4, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions.github/workflows/build_wheels_linux.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ name: Linux x86_64
on:
pull_request:
branches:
-master
-3.4
-4.x
-5.x
paths-ignore:
Expand DownExpand Up@@ -88,7 +86,7 @@ jobs:
ACTIONS_ALLOW_UNSECURE_COMMANDS:true
MB_PYTHON_VERSION:${{ matrix.python-version }}
NP_TEST_DEP:numpy==1.19.4
NP_TEST_DEP_LATEST:numpy==2.2.1
NP_TEST_DEP_LATEST:numpy==2.2.6
CONFIG_PATH:travis_config.sh
PLAT:x86_64
steps:
Expand Down
4 changes: 1 addition & 3 deletions.github/workflows/build_wheels_linux_arm.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ name: Linux ARM64
on:
pull_request:
branches:
-master
-3.4
-4.x
-5.x
paths-ignore:
Expand DownExpand Up@@ -89,7 +87,7 @@ jobs:
MB_PYTHON_VERSION:${{ matrix.python-version }}
PLAT:aarch64
NP_TEST_DEP:numpy==1.19.4
NP_TEST_DEP_LATEST:numpy==2.2.1
NP_TEST_DEP_LATEST:numpy==2.2.6
CONFIG_PATH:travis_config.sh
DOCKER_TEST_IMAGE:multibuild/focal_arm64v8
UNICODE_WIDTH:32
Expand Down
4 changes: 1 addition & 3 deletions.github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ name: macOS x86_64
on:
pull_request:
branches:
-master
-3.4
-4.x
-5.x
paths-ignore:
Expand DownExpand Up@@ -109,7 +107,7 @@ jobs:
ACTIONS_ALLOW_UNSECURE_COMMANDS:true
MB_PYTHON_VERSION:${{ matrix.python-version }}
NP_TEST_DEP:numpy==1.19.4
NP_TEST_DEP_LATEST:numpy==2.2.1
NP_TEST_DEP_LATEST:numpy==2.2.6
CONFIG_PATH:travis_config.sh
PLAT:x86_64
OPENCV_TEST_DATA_PATH:${{ github.workspace }}/opencv_extra/testdata
Expand Down
2 changes: 0 additions & 2 deletions.github/workflows/build_wheels_macos_m1.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ name: macOS ARM64
on:
pull_request:
branches:
-master
-3.4
-4.x
-5.x
paths-ignore:
Expand Down
2 changes: 0 additions & 2 deletions.github/workflows/build_wheels_windows.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ name: Windows x86_64
on:
pull_request:
branches:
-master
-3.4
-4.x
-5.x
paths-ignore:
Expand Down
9 changes: 3 additions & 6 deletionspyproject.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
[build-system]
requires = [
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.19.3; python_version<'3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
"numpy==1.21.0; python_version<'3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
"numpy>=2.0.0; python_version>='3.9'",
"numpy<2.0; python_version<'3.9'",
"numpy==2.0.2; python_version>='3.9' and python_version<'3.13'",
"numpy==2.1.3; python_version=='3.13'",
"packaging",
"pip",
"scikit-build>=0.14.0",
Expand Down
14 changes: 4 additions & 10 deletionssetup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,11 @@ def main():
build_java = "ON" if get_build_env_var_by_name("java") else "OFF"
build_rolling = get_build_env_var_by_name("rolling")

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

python_version = cmaker.CMaker.get_python_version()
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp