Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_51672696
opencv-python
提交
9136e869
O
opencv-python
项目概览
weixin_51672696
/
opencv-python
与 Fork 源项目一致
Fork自
OpenCV / opencv-python
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
9136e869
编写于
6月 30, 2021
作者:
A
Andrey Senyaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added MacOS with M1 build
上级
7a751f74
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
139 addition
and
7 deletion
+139
-7
.github/workflows/build_wheels_linux.yml
.github/workflows/build_wheels_linux.yml
+4
-0
.github/workflows/build_wheels_linux_arm.yml
.github/workflows/build_wheels_linux_arm.yml
+4
-0
.github/workflows/build_wheels_macos.yml
.github/workflows/build_wheels_macos.yml
+4
-0
.github/workflows/build_wheels_macos_m1.yml
.github/workflows/build_wheels_macos_m1.yml
+117
-0
.github/workflows/build_wheels_windows.yml
.github/workflows/build_wheels_windows.yml
+3
-0
pyproject.toml
pyproject.toml
+5
-5
setup.py
setup.py
+2
-2
未找到文件。
.github/workflows/build_wheels_linux.yml
浏览文件 @
9136e869
...
...
@@ -4,6 +4,10 @@ on:
pull_request
:
branches
:
-
master
paths-ignore
:
-
'
.github/workflows/build_wheels_linux_arm.yml'
-
'
.github/workflows/build_wheels_windows*'
-
'
.github/workflows/build_wheels_macos*'
release
:
types
:
[
published
,
edited
]
...
...
.github/workflows/build_wheels_linux_arm.yml
浏览文件 @
9136e869
...
...
@@ -4,6 +4,10 @@ on:
pull_request
:
branches
:
-
master
paths-ignore
:
-
'
.github/workflows/build_wheels_linux.yml'
-
'
.github/workflows/build_wheels_windows*'
-
'
.github/workflows/build_wheels_macos*'
release
:
types
:
[
published
,
edited
]
...
...
.github/workflows/build_wheels_macos.yml
浏览文件 @
9136e869
...
...
@@ -4,6 +4,10 @@ on:
pull_request
:
branches
:
-
master
paths-ignore
:
-
'
.github/workflows/build_wheels_linux*'
-
'
.github/workflows/build_wheels_windows*'
-
'
.github/workflows/build_wheels_macos_m1.yml'
release
:
types
:
[
published
,
edited
]
...
...
.github/workflows/build_wheels_macos_m1.yml
0 → 100644
浏览文件 @
9136e869
name
:
Build PYPI wheels for opencv-python on Macos M1
on
:
pull_request
:
branches
:
-
master
paths-ignore
:
-
'
.github/workflows/build_wheels_linux*'
-
'
.github/workflows/build_wheels_windows*'
-
'
.github/workflows/build_wheels_macos.yml'
release
:
types
:
[
published
,
edited
]
jobs
:
build
:
runs-on
:
${{ matrix.os }}
strategy
:
fail-fast
:
false
matrix
:
os
:
[
macOS-M1
]
python-version
:
[
3.7
,
3.8
,
3.9
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
build_sdist
:
[
0
]
env
:
SDIST
:
${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS
:
${{ matrix.without_gui }}
ENABLE_CONTRIB
:
${{ matrix.with_contrib }}
OPENCV_TEST_DATA_PATH
:
${{ github.workspace }}/opencv_extra/testdata
steps
:
-
name
:
Checkout
uses
:
actions/checkout@v2
with
:
submodules
:
false
fetch-depth
:
0
-
name
:
Update submodules
if
:
github.event_name == 'pull_request'
run
:
git submodule update --remote
-
name
:
build script
run
:
|
git submodule update --init multibuild
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
export MACOSX_DEPLOYMENT_TARGET=11.0
arch -arm64 python${{ matrix.python-version }} -m pip wheel --wheel-dir=wheelhouse . --verbose
-
name
:
before test
run
:
|
git submodule update --init --recursive
arch -arm64 python${{ matrix.python-version }} -m pip install --user --no-cache --force-reinstall wheelhouse/opencv*.whl
cd ${{ github.workspace }}/tests
arch -arm64 python${{ matrix.python-version }} get_build_info.py
-
name
:
run test
run
:
|
cd ${{ github.workspace }}/opencv
arch -arm64 python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
-
name
:
saving artifacts
uses
:
actions/upload-artifact@v2
with
:
name
:
wheels
path
:
wheelhouse/opencv*.whl
test_release_opencv_python
:
if
:
github.event_name == 'release' && github.event.release.prerelease
needs
:
[
build
]
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
:
github.event_name == 'release' && !github.event.release.prerelease
needs
:
[
build
]
runs-on
:
ubuntu-latest
environment
:
opencv-python-release
defaults
:
run
:
shell
:
bash
steps
:
-
uses
:
actions/download-artifact@v2
with
:
name
:
wheels
path
:
wheelhouse/
-
name
:
Upload wheels for opencv_python
run
:
|
python -m pip install twine
python -m twine upload -u ${{ secrets.OPENCV_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_python-*
-
name
:
Upload wheels for opencv_contrib_python
run
:
|
python -m pip install twine
python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python-*
-
name
:
Upload wheels for opencv_python_headless
run
:
|
python -m pip install twine
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-*
.github/workflows/build_wheels_windows.yml
浏览文件 @
9136e869
...
...
@@ -4,6 +4,9 @@ on:
pull_request
:
branches
:
-
master
paths-ignore
:
-
'
.github/workflows/build_wheels_linux*'
-
'
.github/workflows/build_wheels_macos*'
release
:
types
:
[
published
,
edited
]
...
...
pyproject.toml
浏览文件 @
9136e869
[build-system]
requires
=
[
"setuptools"
,
"wheel"
,
"scikit-build"
,
"cmake"
,
"pip"
,
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64'"
,
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64'
and platform_machine != 'arm64'
"
,
"numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'"
,
"numpy==1.2
0.1; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'aarch
64'"
,
"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'"
"numpy==1.2
1.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm
64'"
,
"numpy==1.14.5; 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 platform_machine != 'aarch64'
and platform_machine != 'arm64'
"
]
setup.py
浏览文件 @
9136e869
...
...
@@ -36,8 +36,8 @@ def main():
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
()
==
"a
arch
64"
:
minimum_supported_numpy
=
"1.2
0.1
"
if
sys
.
platform
==
"darwin"
and
sys
.
version_info
[:
2
]
>=
(
3
,
6
)
and
platform
.
machine
()
==
"a
rm
64"
:
minimum_supported_numpy
=
"1.2
1.0
"
numpy_version
=
"numpy>=%s"
%
minimum_supported_numpy
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录