Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv-python
提交
55fc534a
O
opencv-python
项目概览
OpenCV
/
opencv-python
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
55fc534a
编写于
7月 13, 2020
作者:
O
Olli-Pekka Heinisuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
multiple fixes
上级
75bbcf68
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
12 deletion
+20
-12
.travis.yml
.travis.yml
+8
-6
MANIFEST.in
MANIFEST.in
+1
-0
appveyor.yml
appveyor.yml
+1
-1
pyproject.toml
pyproject.toml
+7
-1
setup.py
setup.py
+2
-3
travis_config.sh
travis_config.sh
+1
-1
未找到文件。
.travis.yml
浏览文件 @
55fc534a
...
...
@@ -643,7 +643,7 @@ jobs:
before_install
:
|
set -e
if [ -
z
"$SDIST" ]; then
if [ -
n
"$SDIST" ]; then
echo "sdist build"
else
# Check out and prepare the source
...
...
@@ -687,7 +687,9 @@ install: |
# Build and package
set -x
if [ -z "$SDIST" ]; then
if [ -n "$SDIST" ]; then
python -m pip install --upgrade pip
python -m pip install scikit-build
python setup.py sdist
else
build_wheel $REPO_DIR $PLAT
...
...
@@ -699,7 +701,7 @@ script: |
# Install and run tests
set -x
if [ -
z
"$SDIST" ]; then
if [ -
n
"$SDIST" ]; then
echo "sdist"
else
install_run $PLAT && rc=$? || rc=$?
...
...
@@ -753,7 +755,7 @@ after_success: |
pip install --user twine
pip install --user --upgrade six
if [ -
z
"$SDIST" ]; then
if [ -
n
"$SDIST" ]; then
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
else
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
...
...
@@ -768,7 +770,7 @@ after_success: |
/usr/bin/python -m pip install --user -U pip
/usr/bin/python -m pip install --user -U -I twine
if [ -
z
"$SDIST" ]; then
if [ -
n
"$SDIST" ]; then
/usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
else
/usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
...
...
@@ -788,7 +790,7 @@ after_success: |
az storage container create -n ${TRAVIS_COMMIT} --public-access blob
if [ -
z
"$SDIST" ]; then
if [ -
n
"$SDIST" ]; then
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/dist --pattern *.gz
else
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern *.whl
...
...
MANIFEST.in
浏览文件 @
55fc534a
...
...
@@ -3,6 +3,7 @@ include LICENSE.txt
include README.md
include find_version.py
include setup.py
include pyproject.toml
recursive-include cv2 *
recursive-include docker *
recursive-include opencv *
...
...
appveyor.yml
浏览文件 @
55fc534a
...
...
@@ -141,7 +141,7 @@ build_script:
-
cmd
:
|
"%PYTHON%/python.exe" -m pip install --upgrade pip
"%PYTHON%/python.exe" -m pip install --upgrade setuptools
"%PYTHON%/python.exe"
setup.py bdist_wheel
"%PYTHON%/python.exe"
-m pip wheel . --no-build-isolation --verbose
before_test
:
-
ps
:
|
...
...
pyproject.toml
浏览文件 @
55fc534a
[build-system]
requires
=
[
"setuptools"
,
"wheel"
,
"scikit-build"
,
"cmake"
]
\ No newline at end of file
requires
=
[
"setuptools"
,
"wheel"
,
"scikit-build"
,
"cmake"
,
"pip"
,
"numpy==1.11.3; python_version=='3.5'"
,
"numpy==1.13.3; python_version=='3.6'"
,
"numpy==1.14.5; python_version=='3.7'"
,
"numpy==1.17.3; python_version>='3.8'"
]
\ No newline at end of file
setup.py
浏览文件 @
55fc534a
...
...
@@ -15,13 +15,13 @@ def main():
# These are needed for source fetching
cmake_source_dir
=
"opencv"
minimum_supported_numpy
=
"1.1
1
.1"
minimum_supported_numpy
=
"1.1
3
.1"
build_contrib
=
get_build_env_var_by_name
(
"contrib"
)
# headless flag to skip GUI deps if needed
build_headless
=
get_build_env_var_by_name
(
"headless"
)
if
sys
.
version_info
[:
2
]
>=
(
3
,
6
):
minimum_supported_numpy
=
"1.1
1
.3"
minimum_supported_numpy
=
"1.1
3
.3"
if
sys
.
version_info
[:
2
]
>=
(
3
,
7
):
minimum_supported_numpy
=
"1.14.5"
if
sys
.
version_info
[:
2
]
>=
(
3
,
8
):
...
...
@@ -176,7 +176,6 @@ def main():
packages
=
packages
,
package_data
=
package_data
,
maintainer
=
"Olli-Pekka Heinisuo"
,
include_package_data
=
True
,
ext_modules
=
EmptyListWithLength
(),
install_requires
=
numpy_version
,
classifiers
=
[
...
...
travis_config.sh
浏览文件 @
55fc534a
...
...
@@ -14,7 +14,7 @@ function bdist_wheel_cmd {
# copied from multibuild's common_utils.sh
# add osx deployment target so it doesnt default to 10.6
local
abs_wheelhouse
=
$1
p
ython setup.py bdist_wheel
$BDIST_PARAMS
p
ip wheel
.
--no-build-isolation
--verbose
$BDIST_PARAMS
cp
dist/
*
.whl
$abs_wheelhouse
if
[
-n
"
$USE_CCACHE
"
-a
-z
"
$BREW_BOOTSTRAP_MODE
"
]
;
then
ccache
-s
;
fi
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录