Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv-python
提交
b38fff04
O
opencv-python
项目概览
OpenCV
/
opencv-python
12 个月 前同步成功
通知
230
Star
3707
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,发现更多精彩内容 >>
提交
b38fff04
编写于
7月 14, 2018
作者:
O
Olli-Pekka Heinisuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bump OpenCV version to 3.4.2, udpate multibuild, add Python 3.7 support, update Dockerfiles
上级
deafb670
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
100 addition
and
4 deletion
+100
-4
.travis.yml
.travis.yml
+57
-0
appveyor.yml
appveyor.yml
+32
-0
multibuild
multibuild
+1
-1
opencv
opencv
+1
-1
opencv_contrib
opencv_contrib
+1
-1
setup.py
setup.py
+8
-1
未找到文件。
.travis.yml
浏览文件 @
b38fff04
...
...
@@ -56,6 +56,13 @@ matrix:
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=0
-
os
:
osx
language
:
generic
osx_image
:
xcode7.3
env
:
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=0
# headless builds for MacOS
-
os
:
osx
...
...
@@ -86,6 +93,13 @@ matrix:
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=1
-
os
:
osx
language
:
generic
osx_image
:
xcode7.3
env
:
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=1
# Contrib builds for MacOS
-
os
:
osx
...
...
@@ -116,6 +130,13 @@ matrix:
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=0
-
os
:
osx
language
:
generic
osx_image
:
xcode7.3
env
:
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=0
# headless contrib builds for MacOS
-
os
:
osx
...
...
@@ -146,6 +167,13 @@ matrix:
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=1
-
os
:
osx
language
:
generic
osx_image
:
xcode7.3
env
:
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=1
# default builds for Linux
-
os
:
linux
...
...
@@ -207,6 +235,13 @@ matrix:
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=0
-
TEST_DEPENDS=numpy==1.11.3
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.7
-
PLAT=i686
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=0
-
TEST_DEPENDS=numpy==1.14.5
# headless builds for Linux
-
os
:
linux
...
...
@@ -268,6 +303,13 @@ matrix:
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=1
-
TEST_DEPENDS=numpy==1.11.3
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.7
-
PLAT=i686
-
ENABLE_CONTRIB=0
-
ENABLE_HEADLESS=1
-
TEST_DEPENDS=numpy==1.14.5
# contrib builds for Linux
-
os
:
linux
...
...
@@ -329,6 +371,14 @@ matrix:
-
TEST_DEPENDS=numpy==1.11.3
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.7
-
PLAT=i686
-
TEST_DEPENDS=numpy==1.14.5
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=0
# headless contrib builds for Linux
-
os
:
linux
...
...
@@ -390,6 +440,13 @@ matrix:
-
TEST_DEPENDS=numpy==1.11.3
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=1
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.7
-
PLAT=i686
-
TEST_DEPENDS=numpy==1.14.5
-
ENABLE_CONTRIB=1
-
ENABLE_HEADLESS=1
# The first line is printed in the folding header in Travis output
before_install
:
|
...
...
appveyor.yml
浏览文件 @
b38fff04
...
...
@@ -38,6 +38,14 @@ environment:
ENABLE_CONTRIB
:
0
ENABLE_HEADLESS
:
0
-
PYTHON
:
"
C:/Python37"
ENABLE_CONTRIB
:
0
ENABLE_HEADLESS
:
0
-
PYTHON
:
"
C:/Python37-x64"
ENABLE_CONTRIB
:
0
ENABLE_HEADLESS
:
0
-
PYTHON
:
"
C:/Python27"
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
0
...
...
@@ -70,6 +78,14 @@ environment:
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
0
-
PYTHON
:
"
C:/Python37"
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
0
-
PYTHON
:
"
C:/Python37-x64"
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
0
-
PYTHON
:
"
C:/Python27"
ENABLE_CONTRIB
:
0
ENABLE_HEADLESS
:
1
...
...
@@ -102,6 +118,14 @@ environment:
ENABLE_CONTRIB
:
0
ENABLE_HEADLESS
:
1
-
PYTHON
:
"
C:/Python37"
ENABLE_CONTRIB
:
0
ENABLE_HEADLESS
:
1
-
PYTHON
:
"
C:/Python37-x64"
ENABLE_CONTRIB
:
0
ENABLE_HEADLESS
:
1
-
PYTHON
:
"
C:/Python27"
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
1
...
...
@@ -134,6 +158,14 @@ environment:
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
1
-
PYTHON
:
"
C:/Python37"
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
1
-
PYTHON
:
"
C:/Python37-x64"
ENABLE_CONTRIB
:
1
ENABLE_HEADLESS
:
1
matrix
:
fast_finish
:
true
...
...
multibuild
@
afbff539
比较
ae3e5598
...
afbff539
Subproject commit a
e3e559829d34a74c706baa9389a101e52d8e2d0
Subproject commit a
fbff539ea815f3dafcd68f1bf1e87c4381bcbda
opencv
@
9e1b1e53
比较
6ffc4876
...
9e1b1e53
Subproject commit
6ffc48769ac60d53c4bd1913eac15117c9b1c9f7
Subproject commit
9e1b1e5389237c2b9f6c7b9d7715d9836c0a5de1
opencv_contrib
@
d4e02869
比较
ced5aa76
...
d4e02869
Subproject commit
ced5aa760688dd2ec867ebf7bd4f0c2341d2fde5
Subproject commit
d4e02869454998c9af5af1a5c3392cdc0c31dd22
setup.py
浏览文件 @
b38fff04
...
...
@@ -22,7 +22,14 @@ def main():
# Only import 3rd-party modules after having installed all the build dependencies:
# any of them, or their dependencies, can be updated during that process,
# leading to version conflicts
numpy_version
=
get_or_install
(
"numpy"
,
"1.11.3"
if
sys
.
version_info
[:
2
]
>=
(
3
,
6
)
else
"1.11.1"
)
minimum_supported_numpy
=
"1.11.1"
if
sys
.
version_info
[:
2
]
>=
(
3
,
6
):
minimum_supported_numpy
=
"1.11.3"
if
sys
.
version_info
[:
2
]
>=
(
3
,
7
):
minimum_supported_numpy
=
"1.14.5"
numpy_version
=
get_or_install
(
"numpy"
,
minimum_supported_numpy
)
get_or_install
(
"scikit-build"
)
import
skbuild
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录