Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv-python
提交
42ac3ea3
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 搜索 >>
未验证
提交
42ac3ea3
编写于
5月 06, 2021
作者:
G
Grigory Serebryakov
提交者:
GitHub
5月 06, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #480 from opencv/master
Update build process & sync master and 3.4
上级
23b92ebd
88c1735d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
4 deletion
+28
-4
.github/workflows/build_wheels.yml
.github/workflows/build_wheels.yml
+21
-2
pyproject.toml
pyproject.toml
+1
-0
setup.py
setup.py
+6
-2
未找到文件。
.github/workflows/build_wheels.yml
浏览文件 @
42ac3ea3
...
...
@@ -244,8 +244,27 @@ jobs:
name
:
wheels
path
:
dist/opencv*.tar.gz
test_release_opencv_python
:
if
:
github.event_name == 'release' && github.event.release.prerelease
needs
:
[
build
,
build-windows-x86_64
,
build_sdist
]
runs-on
:
ubuntu-latest
environment
:
test-opencv-python-release
defaults
:
run
:
shell
:
bash
steps
:
-
uses
:
actions/download-artifact@v2
with
:
name
:
wheels
path
:
wheelhouse/
-
name
:
Upload all wheels
run
:
|
python -m pip install twine
python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_*
release_opencv_python
:
if
:
startsWith(github.ref, 'refs/tags/v')
if
:
github.event_name == 'release' && !github.event.release.prerelease
needs
:
[
build
,
build-windows-x86_64
,
build_sdist
]
runs-on
:
ubuntu-latest
environment
:
opencv-python-release
...
...
@@ -257,6 +276,7 @@ jobs:
with
:
name
:
wheels
path
:
wheelhouse/
-
name
:
Upload wheels for opencv_python
run
:
|
python -m pip install twine
...
...
@@ -273,7 +293,6 @@ jobs:
python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless-*
-
name
:
Upload wheels for opencv_contrib_python_headless
run
:
|
python -m pip install twine
python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless-*
pyproject.toml
浏览文件 @
42ac3ea3
...
...
@@ -3,6 +3,7 @@ requires = [
"setuptools"
,
"wheel"
,
"scikit-build"
,
"cmake"
,
"pip"
,
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64'"
,
"numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'"
,
"numpy==1.20.1; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'aarch64'"
,
"numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64'"
,
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64'"
,
"numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64'"
...
...
setup.py
浏览文件 @
42ac3ea3
...
...
@@ -31,10 +31,14 @@ def main():
if
sys
.
version_info
[:
2
]
>=
(
3
,
9
):
minimum_supported_numpy
=
"1.19.3"
# arm64 is a special case
if
sys
.
version_info
[:
2
]
>=
(
3
,
6
)
and
platform
.
machine
()
==
"aarch64"
:
#
linux
arm64 is a special case
if
sys
.
platform
.
startswith
(
"linux"
)
and
sys
.
version_info
[:
2
]
>=
(
3
,
6
)
and
platform
.
machine
()
==
"aarch64"
:
minimum_supported_numpy
=
"1.19.3"
# macos arm64 is a special case
if
sys
.
platform
==
"darwin"
and
sys
.
version_info
[:
2
]
>=
(
3
,
6
)
and
platform
.
machine
()
==
"aarch64"
:
minimum_supported_numpy
=
"1.20.1"
numpy_version
=
"numpy>=%s"
%
minimum_supported_numpy
python_version
=
cmaker
.
CMaker
.
get_python_version
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录