Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv-python
提交
339bca57
O
opencv-python
项目概览
OpenCV
/
opencv-python
8 个月 前同步成功
通知
228
Star
3706
Fork
754
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
339bca57
编写于
12月 29, 2022
作者:
A
Alexander Smorkalov
提交者:
GitHub
12月 29, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OpenCV 4.7.0 release preparation
- Python 3.7 as baseline - Python 3.11 support - Various updates
上级
7ebbdc32
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
37 addition
and
30 deletion
+37
-30
.github/workflows/build_wheels_linux.yml
.github/workflows/build_wheels_linux.yml
+4
-4
.github/workflows/build_wheels_linux_arm.yml
.github/workflows/build_wheels_linux_arm.yml
+4
-4
.github/workflows/build_wheels_macos.yml
.github/workflows/build_wheels_macos.yml
+11
-5
.github/workflows/build_wheels_macos_m1.yml
.github/workflows/build_wheels_macos_m1.yml
+2
-2
.github/workflows/build_wheels_windows.yml
.github/workflows/build_wheels_windows.yml
+4
-4
multibuild
multibuild
+1
-1
opencv
opencv
+1
-1
opencv_contrib
opencv_contrib
+1
-1
opencv_extra
opencv_extra
+1
-1
patch_auditwheel_whitelist.py
patch_auditwheel_whitelist.py
+3
-2
pyproject.toml
pyproject.toml
+1
-1
setup.py
setup.py
+1
-1
travis_config.sh
travis_config.sh
+3
-3
未找到文件。
.github/workflows/build_wheels_linux.yml
浏览文件 @
339bca57
...
...
@@ -27,7 +27,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6
'
]
python-version
:
[
'
3.
7
'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -84,7 +84,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10
'
]
python-version
:
[
'
3.
7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
,
'
3.11
'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -93,7 +93,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==1.2
1.2
NP_TEST_DEP_LATEST
:
numpy==1.2
4.0
CONFIG_PATH
:
travis_config.sh
PLAT
:
x86_64
steps
:
...
...
@@ -106,7 +106,7 @@ jobs:
submodules
:
true
fetch-depth
:
0
-
name
:
Setup Environment variables
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
run
:
if [ "3.10" == "${{ matrix.python-version }}"
-o "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
-
name
:
Download a wheel accordingly to matrix
uses
:
actions/download-artifact@v3
with
:
...
...
.github/workflows/build_wheels_linux_arm.yml
浏览文件 @
339bca57
...
...
@@ -27,7 +27,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6
'
]
python-version
:
[
'
3.
7
'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -84,7 +84,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10
'
]
python-version
:
[
'
3.
7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
,
'
3.11
'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -94,7 +94,7 @@ jobs:
MB_PYTHON_VERSION
:
${{ matrix.python-version }}
PLAT
:
aarch64
NP_TEST_DEP
:
numpy==1.19.4
NP_TEST_DEP_LATEST
:
numpy==1.2
1.4
NP_TEST_DEP_LATEST
:
numpy==1.2
4.0
CONFIG_PATH
:
travis_config.sh
DOCKER_TEST_IMAGE
:
multibuild/focal_arm64v8
UNICODE_WIDTH
:
32
...
...
@@ -108,7 +108,7 @@ jobs:
submodules
:
true
fetch-depth
:
0
-
name
:
Setup Environment variables
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
run
:
if [ "3.10" == "${{ matrix.python-version }}"
-o "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
-
name
:
Download a wheel accordingly to matrix
uses
:
actions/download-artifact@v3
with
:
...
...
.github/workflows/build_wheels_macos.yml
浏览文件 @
339bca57
...
...
@@ -27,7 +27,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6
'
]
python-version
:
[
'
3.
7
'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -58,6 +58,12 @@ jobs:
if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
fi
# hack for image issue on mac: https://github.com/actions/runner-images/issues/6817
rm /usr/local/bin/2to3*
rm /usr/local/bin/idle3*
rm /usr/local/bin/pydoc3*
rm /usr/local/bin/python3*
# end hack
-
name
:
Checkout
uses
:
actions/checkout@v3
with
:
...
...
@@ -100,7 +106,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10
'
]
python-version
:
[
'
3.
7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
,
'
3.11
'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -109,7 +115,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==1.2
1.4
NP_TEST_DEP_LATEST
:
numpy==1.2
4.0
CONFIG_PATH
:
travis_config.sh
PLAT
:
x86_64
OPENCV_TEST_DATA_PATH
:
${{ github.workspace }}/opencv_extra/testdata
...
...
@@ -129,7 +135,7 @@ jobs:
python-version
:
${{ matrix.python-version }}
architecture
:
${{ matrix.platform }}
-
name
:
Setup Environment variables
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
run
:
if [ "3.10" == "${{ matrix.python-version }}"
-o "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
-
name
:
Download a wheel accordingly to matrix
uses
:
actions/download-artifact@v3
with
:
...
...
@@ -146,7 +152,7 @@ jobs:
python modules/python/test/test.py -v --repo .
-
name
:
Pylint test
run
:
|
python -m pip install pylint==2.1
2.2
python -m pip install pylint==2.1
5.9
cd ${{ github.workspace }}/tests
python -m pylint $PYLINT_TEST_FILE
...
...
.github/workflows/build_wheels_macos_m1.yml
浏览文件 @
339bca57
...
...
@@ -75,7 +75,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
python-version
:
[
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
,
'
3.11'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -109,7 +109,7 @@ jobs:
arch -arm64 python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
-
name
:
Pylint test
run
:
|
arch -arm64 python${{ matrix.python-version }} -m pip install pylint==2.1
2.2
arch -arm64 python${{ matrix.python-version }} -m pip install pylint==2.1
5.9
cd ${{ github.workspace }}/tests
arch -arm64 python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE
...
...
.github/workflows/build_wheels_windows.yml
浏览文件 @
339bca57
...
...
@@ -23,7 +23,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6
'
]
python-version
:
[
'
3.
7
'
]
platform
:
[
x86
,
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -67,7 +67,7 @@ jobs:
python -m pip install --upgrade setuptools
python -m pip install cmake==3.24.2
python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt
set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp3
6
--dist-dir=%cd%\wheelhouse -v
set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp3
7
--dist-dir=%cd%\wheelhouse -v
shell
:
cmd
-
name
:
Saving all wheels
uses
:
actions/upload-artifact@v3
...
...
@@ -89,7 +89,7 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
python-version
:
[
'
3.
6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10
'
]
python-version
:
[
'
3.
7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
,
'
3.11
'
]
platform
:
[
x86
,
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -133,7 +133,7 @@ jobs:
python modules\python\test\test.py -v --repo .
-
name
:
Pylint test
run
:
|
python -m pip install pylint==2.1
2.2
python -m pip install pylint==2.1
5.9
cd ${{ github.workspace }}\tests
python -m pylint $PYLINT_TEST_FILE
...
...
multibuild
@
15fd8770
比较
bce1637e
...
15fd8770
Subproject commit
bce1637e202cb52b0e7ea42baa1cccc894b82806
Subproject commit
15fd8770abe6b12e94c2362ae8f21cd876bd998e
opencv
@
725e440d
比较
ab912329
...
725e440d
Subproject commit
ab912329b67d3a142a1b399b4bc9fa9b68cd8df
6
Subproject commit
725e440d278aca07d35a5e8963ef990572b0731
6
opencv_contrib
@
e247b680
比较
d6102ef6
...
e247b680
Subproject commit
d6102ef65f9ccdb37bba0ea9b8254951eb89dc39
Subproject commit
e247b680a6bd396f110274b6c214406a93171350
opencv_extra
@
5abbd7e0
比较
531785fb
...
5abbd7e0
Subproject commit 5
31785fb1a42b2665e0e06c8b191de58db6deb10
Subproject commit 5
abbd7e0546bbb34ae7487170383d3e571fb1dd1
patch_auditwheel_whitelist.py
浏览文件 @
339bca57
...
...
@@ -12,9 +12,10 @@ def add_zlib_versions():
for
line
in
manylinux_policy_lines
:
if
"ZLIB"
in
line
:
if
len
(
line
)
>
22
:
updated_line
=
line
[:
-
2
]
+
', "1.2.9", "1.2.12"]'
updated_line
=
line
[:
-
2
]
+
', "1.2.9", "1.2.12"
, "1.2.13"
]'
else
:
updated_line
=
line
[:
-
2
]
+
'"1.2.9", "1.2.12"]'
updated_line
=
line
[:
-
2
]
+
'"1.2.9", "1.2.12", "1.2.13"]'
print
(
"auditwheel patch: replace policy line
\"
%s
\"
with
\"
%s
\"
"
%
(
line
,
updated_line
))
manylinux_policy_replacement
=
line
.
replace
(
line
,
updated_line
)
else
:
manylinux_policy_replacement
=
line
...
...
pyproject.toml
浏览文件 @
339bca57
...
...
@@ -3,7 +3,7 @@ requires = [
"setuptools==59.2.0"
,
"wheel==0.37.0"
,
"cmake>=3.1"
,
"pip"
,
"scikit-build>=0.13.2"
,
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
,
"numpy==1.1
4.5
; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
,
"numpy==1.1
7.0
; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
,
"numpy==1.17.3; 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'"
,
...
...
setup.py
浏览文件 @
339bca57
...
...
@@ -25,7 +25,7 @@ def main():
install_requires
=
[
'numpy>=1.13.3; python_version<"3.7"'
,
'numpy>=1.1
4.5; python_version>="3.7"'
,
'numpy>=1.1
7.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"'
,
...
...
travis_config.sh
浏览文件 @
339bca57
...
...
@@ -16,7 +16,7 @@ function bdist_wheel_cmd {
local
abs_wheelhouse
=
$1
# install all required packages in pyproject.toml, because bdist_wheel does not do it
python
${
PYTHON_VERSION
}
-m
pip
install
toml
&&
python
${
PYTHON_VERSION
}
-c
'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))'
| python
${
PYTHON_VERSION
}
-m
pip
install
-r
/dev/stdin
CI_BUILD
=
1 python
${
PYTHON_VERSION
}
setup.py bdist_wheel
--py-limited-api
=
cp3
6
-v
CI_BUILD
=
1 python
${
PYTHON_VERSION
}
setup.py bdist_wheel
--py-limited-api
=
cp3
7
-v
cp
dist/
*
.whl
$abs_wheelhouse
if
[
-z
"
$IS_OSX
"
]
;
then
# this path can be changed in the latest manylinux image
...
...
@@ -143,7 +143,7 @@ function run_tests {
echo
"Running for linux"
if
[
$PYTHON
==
"python3.
6
"
]
;
then
if
[
$PYTHON
==
"python3.
7
"
]
;
then
$PYTHON
-m
pip
install
-U
numpy
==
1.19.4
fi
cd
/io/tests
...
...
@@ -168,7 +168,7 @@ function pylint_test {
echo
"Starting Pylint tests..."
$PYTHON
-m
pip
install
pylint
==
2.1
2.2
$PYTHON
-m
pip
install
pylint
==
2.1
5.9
cd
/io/tests
$PYTHON
-m
pylint /io/opencv/samples/python/squares.py
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录