Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_51672696
opencv-python
提交
d82a270e
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,体验更适合开发者的 AI 搜索 >>
提交
d82a270e
编写于
10月 08, 2021
作者:
A
Andrey Senyaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated Github Actions to python 3.10 and fixed following issues
上级
80f0790c
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
58 addition
and
51 deletion
+58
-51
.github/workflows/build_wheels_linux.yml
.github/workflows/build_wheels_linux.yml
+5
-7
.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
+17
-13
.github/workflows/build_wheels_macos_m1.yml
.github/workflows/build_wheels_macos_m1.yml
+1
-1
.github/workflows/build_wheels_windows.yml
.github/workflows/build_wheels_windows.yml
+1
-1
docker/manylinux2014/Dockerfile_aarch64
docker/manylinux2014/Dockerfile_aarch64
+5
-5
docker/manylinux2014/Dockerfile_i686
docker/manylinux2014/Dockerfile_i686
+5
-5
docker/manylinux2014/Dockerfile_x86_64
docker/manylinux2014/Dockerfile_x86_64
+5
-5
multibuild
multibuild
+1
-1
pyproject.toml
pyproject.toml
+4
-3
scripts/build.sh
scripts/build.sh
+0
-1
setup.py
setup.py
+5
-3
travis_config.sh
travis_config.sh
+4
-1
travis_multibuild_customize.sh
travis_multibuild_customize.sh
+1
-1
未找到文件。
.github/workflows/build_wheels_linux.yml
浏览文件 @
d82a270e
...
...
@@ -23,7 +23,7 @@ jobs:
fail-fast
:
false
matrix
:
os
:
[
ubuntu-latest
]
python-version
:
[
3.6
,
3.7
,
3.8
,
3.9
]
python-version
:
[
'
3.6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -38,9 +38,10 @@ jobs:
TRAVIS_PYTHON_VERSION
:
${{ matrix.python-version }}
MB_ML_VER
:
2014
NP_TEST_DEP
:
numpy==1.19.4
NP_TEST_DEP_3_10
:
numpy==1.21.2
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/
skvark
/manylinux2014_${PLAT}
DOCKER_IMAGE
:
quay.io/
asenyaev
/manylinux2014_${PLAT}
USE_CCACHE
:
1
UNICODE_WIDTH
:
32
SDIST
:
${{ matrix.build_sdist || 0 }}
...
...
@@ -63,8 +64,7 @@ jobs:
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_3_10)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
-
name
:
build
run
:
source scripts/build.sh
...
...
@@ -107,7 +107,7 @@ jobs:
NP_TEST_DEP
:
numpy==1.19.4
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/
skvark
/manylinux2014_${PLAT}
DOCKER_IMAGE
:
quay.io/
asenyaev
/manylinux2014_${PLAT}
USE_CCACHE
:
1
UNICODE_WIDTH
:
32
SDIST
:
${{ matrix.build_sdist || 0 }}
...
...
@@ -135,8 +135,6 @@ jobs:
run
:
|
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
-
name
:
before install
run
:
|
...
...
.github/workflows/build_wheels_linux_arm.yml
浏览文件 @
d82a270e
...
...
@@ -23,7 +23,7 @@ jobs:
fail-fast
:
false
matrix
:
os
:
[
ARM64
]
python-version
:
[
3.6
,
3.7
,
3.8
,
3.9
]
python-version
:
[
'
3.6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
@@ -39,9 +39,10 @@ jobs:
PLAT
:
aarch64
MB_ML_VER
:
2014
NP_TEST_DEP
:
numpy==1.19.4
NP_TEST_DEP_3_10
:
numpy==1.21.2
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/
skvark
/manylinux2014_${PLAT}
DOCKER_IMAGE
:
quay.io/
asenyaev
/manylinux2014_${PLAT}
DOCKER_TEST_IMAGE
:
multibuild/xenial_arm64v8
USE_CCACHE
:
0
UNICODE_WIDTH
:
32
...
...
@@ -63,8 +64,7 @@ jobs:
-
name
:
Setup Environment variables
run
:
|
if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_3_10)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
-
name
:
build
run
:
source scripts/build.sh
...
...
.github/workflows/build_wheels_macos.yml
浏览文件 @
d82a270e
...
...
@@ -22,12 +22,23 @@ jobs:
strategy
:
fail-fast
:
false
matrix
:
os
:
[
macos-
latest
]
python-version
:
[
3.6
,
3.7
,
3.8
,
3.9
]
os
:
[
macos-
10.15
,
macos-11
]
python-version
:
[
'
3.6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
build_sdist
:
[
0
]
exclude
:
-
os
:
macos-10.15
python-version
:
'
3.10'
-
os
:
macos-11
python-version
:
'
3.6'
-
os
:
macos-11
python-version
:
'
3.7'
-
os
:
macos-11
python-version
:
'
3.8'
-
os
:
macos-11
python-version
:
'
3.9'
env
:
ACTIONS_ALLOW_UNSECURE_COMMANDS
:
true
...
...
@@ -38,9 +49,11 @@ jobs:
TRAVIS_PYTHON_VERSION
:
${{ matrix.python-version }}
MB_ML_VER
:
2014
NP_TEST_DEP
:
numpy==1.19.4
NP_TEST_DEP_3_10
:
numpy==1.21.2
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
TRAVIS_OS_NAME
:
osx
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/
skvark
/manylinux2014_${PLAT}
DOCKER_IMAGE
:
quay.io/
asenyaev
/manylinux2014_${PLAT}
USE_CCACHE
:
1
UNICODE_WIDTH
:
32
SDIST
:
${{ matrix.build_sdist || 0 }}
...
...
@@ -58,22 +71,13 @@ jobs:
if
:
github.event_name == 'pull_request'
run
:
git submodule update --remote
-
name
:
Set up Python ${{ matrix.python-version }}
uses
:
actions/setup-python@v2
if
:
${{ 'macos-latest' == matrix.os }}
with
:
python-version
:
${{ matrix.python-version }}
architecture
:
${{ matrix.platform }}
-
name
:
Setup Environment variables
run
:
|
if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_3_10)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
-
name
:
before install
run
:
|
...
...
.github/workflows/build_wheels_macos_m1.yml
浏览文件 @
d82a270e
...
...
@@ -20,7 +20,7 @@ jobs:
fail-fast
:
false
matrix
:
os
:
[
macOS-M1
]
python-version
:
[
3.7
,
3.8
,
3.9
]
python-version
:
[
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
platform
:
[
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
.github/workflows/build_wheels_windows.yml
浏览文件 @
d82a270e
...
...
@@ -22,7 +22,7 @@ jobs:
fail-fast
:
false
matrix
:
os
:
[
windows-latest
]
python-version
:
[
3.6
,
3.7
,
3.8
,
3.9
]
python-version
:
[
'
3.6'
,
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
platform
:
[
x86
,
x64
]
with_contrib
:
[
0
,
1
]
without_gui
:
[
0
,
1
]
...
...
docker/manylinux2014/Dockerfile_aarch64
浏览文件 @
d82a270e
...
...
@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
rm -rf ~/openssl_build
RUN cd ~/ffmpeg_sources && \
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.1
4.01/nasm-2.14.01
.tar.bz2 && \
tar -xf nasm-2.1
4.01.tar.bz2 && cd nasm-2.14.01
&& ./autogen.sh && \
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.1
5.04/nasm-2.15.04
.tar.bz2 && \
tar -xf nasm-2.1
5.04.tar.bz2 && cd nasm-2.15.04
&& ./autogen.sh && \
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
...
...
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
make install
RUN cd ~/ffmpeg_sources && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-
snapshot
.tar.bz2 && \
tar -xf ffmpeg-
snapshot
.tar.bz2 && \
cd ffmpeg && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-
4.3.2
.tar.bz2 && \
tar -xf ffmpeg-
4.3.2
.tar.bz2 && \
cd ffmpeg
-4.3.2
&& \
PATH=~/bin:$PATH && \
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
...
...
docker/manylinux2014/Dockerfile_i686
浏览文件 @
d82a270e
...
...
@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
rm -rf ~/openssl_build
RUN cd ~/ffmpeg_sources && \
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.1
4.01/nasm-2.14.01
.tar.bz2 && \
tar -xf nasm-2.1
4.01.tar.bz2 && cd nasm-2.14.01
&& ./autogen.sh && \
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.1
5.04/nasm-2.15.04
.tar.bz2 && \
tar -xf nasm-2.1
5.04.tar.bz2 && cd nasm-2.15.04
&& ./autogen.sh && \
linux32 ./configure && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
...
...
@@ -52,9 +52,9 @@ RUN cd ~/ffmpeg_sources && \
make install
RUN cd ~/ffmpeg_sources && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-
snapshot
.tar.bz2 && \
tar -xf ffmpeg-
snapshot
.tar.bz2 && \
cd ffmpeg && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-
4.3.2
.tar.bz2 && \
tar -xf ffmpeg-
4.3.2
.tar.bz2 && \
cd ffmpeg
-4.3.2
&& \
PATH=~/bin:$PATH && \
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" linux32 ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
...
...
docker/manylinux2014/Dockerfile_x86_64
浏览文件 @
d82a270e
...
...
@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
rm -rf ~/openssl_build
RUN cd ~/ffmpeg_sources && \
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.1
4.01/nasm-2.14.01
.tar.bz2 && \
tar -xf nasm-2.1
4.01.tar.bz2 && cd nasm-2.14.01
&& ./autogen.sh && \
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.1
5.04/nasm-2.15.04
.tar.bz2 && \
tar -xf nasm-2.1
5.04.tar.bz2 && cd nasm-2.15.04
&& ./autogen.sh && \
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
...
...
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
make install
RUN cd ~/ffmpeg_sources && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-
snapshot
.tar.bz2 && \
tar -xf ffmpeg-
snapshot
.tar.bz2 && \
cd ffmpeg && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-
4.3.2
.tar.bz2 && \
tar -xf ffmpeg-
4.3.2
.tar.bz2 && \
cd ffmpeg
-4.3.2
&& \
PATH=~/bin:$PATH && \
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
...
...
multibuild
@
b89bb903
比较
8882150d
...
b89bb903
Subproject commit
8882150df6529658700b66bec124dfb77eefca26
Subproject commit
b89bb903e94308be79abefa4f436bf123ebb1313
pyproject.toml
浏览文件 @
d82a270e
...
...
@@ -2,9 +2,10 @@
requires
=
[
"setuptools"
,
"wheel"
,
"scikit-build"
,
"cmake"
,
"pip"
,
"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.21.
0
; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'"
,
"numpy==1.
21.2
; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'"
,
"numpy==1.21.
2
; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'"
,
"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'"
"numpy==1.21.2; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
,
"numpy==1.21.2; python_version>='3.10' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
]
scripts/build.sh
浏览文件 @
d82a270e
...
...
@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo
$ENABLE_HEADLESS
>
headless.enabled
set
-x
build_wheel
$REPO_DIR
$PLAT
rm
wheelhouse/numpy
*
setup.py
浏览文件 @
d82a270e
...
...
@@ -29,15 +29,17 @@ def main():
if
sys
.
version_info
[:
2
]
>=
(
3
,
8
):
minimum_supported_numpy
=
"1.17.3"
if
sys
.
version_info
[:
2
]
>=
(
3
,
9
):
minimum_supported_numpy
=
"1.19.3"
minimum_supported_numpy
=
"1.21.2"
if
sys
.
version_info
[:
2
]
>=
(
3
,
10
):
minimum_supported_numpy
=
"1.21.2"
# 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
"
minimum_supported_numpy
=
"1.
21.2
"
# macos arm64 is a special case
if
sys
.
platform
==
"darwin"
and
sys
.
version_info
[:
2
]
>=
(
3
,
6
)
and
platform
.
machine
()
==
"arm64"
:
minimum_supported_numpy
=
"1.21.
0
"
minimum_supported_numpy
=
"1.21.
2
"
numpy_version
=
"numpy>=%s"
%
minimum_supported_numpy
...
...
travis_config.sh
浏览文件 @
d82a270e
...
...
@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
TOOLS_PATH
=
/opt/_internal/tools
/opt/python/cp37-cp37m/bin/python
-m
venv
$TOOLS_PATH
source
$TOOLS_PATH
/bin/activate
python patch_auditwheel_whitelist.py
python
$PYTHON_VERSION
-m
pip
install
auditwheel
==
3.2.0
python
$PYTHON_VERSION
patch_auditwheel_whitelist.py
# to avoid issues with numpy wheels
rm
/io/wheelhouse/numpy
*
deactivate
fi
if
[
-n
"
$USE_CCACHE
"
-a
-z
"
$BREW_BOOTSTRAP_MODE
"
]
;
then
ccache
-s
;
fi
...
...
travis_multibuild_customize.sh
浏览文件 @
d82a270e
...
...
@@ -3,4 +3,4 @@
export
PS4
=
'+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set
-x
REPO_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
DOCKER_IMAGE
=
'quay.io/
skvark
/manylinux2014_$plat'
DOCKER_IMAGE
=
'quay.io/
asenyaev
/manylinux2014_$plat'
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录