Skip to content

O
opencv-python

Richard 祝发兴 - -IT / opencv-python
与 Fork 源项目一致

Fork自 OpenCV / opencv-python

通知 1
Star 1
Fork 0
O
opencv-python

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 50c4fe32 编写于 作者: O Olli-Pekka Heinisuo
浏览文件
操作

update 3.4 from master

上级 22e5ae84 dfc59fe3
隐藏空白更改
内联 并排
Showing with 130 addition and 113 deletion
.travis.yml
浏览文件 @ 50c4fe32
...@@ -7,9 +7,8 @@ env: ...@@ -7,9 +7,8 @@ env:
- BDIST_PARAMS="" - BDIST_PARAMS=""
- CONFIG_PATH="travis_config.sh" - CONFIG_PATH="travis_config.sh"
- USE_CCACHE=1 - USE_CCACHE=1
- PLAT=x86_64
- UNICODE_WIDTH=32 - UNICODE_WIDTH=32
- MB_PYTHON_VERSION=3.7
# Host Python is never used # Host Python is never used
language: generic language: generic
...@@ -75,7 +74,7 @@ matrix: ...@@ -75,7 +74,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
workspaces: workspaces:
...@@ -83,7 +82,7 @@ matrix: ...@@ -83,7 +82,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
workspaces: workspaces:
...@@ -91,18 +90,19 @@ matrix: ...@@ -91,18 +90,19 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5
workspaces: workspaces:
use: brew_cache use: brew_cache
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
workspaces: workspaces:
use: brew_cache use: brew_cache
...@@ -118,7 +118,7 @@ matrix: ...@@ -118,7 +118,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
workspaces: workspaces:
...@@ -126,7 +126,7 @@ matrix: ...@@ -126,7 +126,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
workspaces: workspaces:
...@@ -134,18 +134,19 @@ matrix: ...@@ -134,18 +134,19 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5
workspaces: workspaces:
use: brew_cache use: brew_cache
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
workspaces: workspaces:
use: brew_cache use: brew_cache
...@@ -161,7 +162,7 @@ matrix: ...@@ -161,7 +162,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
workspaces: workspaces:
...@@ -169,7 +170,7 @@ matrix: ...@@ -169,7 +170,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
workspaces: workspaces:
...@@ -177,18 +178,19 @@ matrix: ...@@ -177,18 +178,19 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5
workspaces: workspaces:
use: brew_cache use: brew_cache
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
workspaces: workspaces:
use: brew_cache use: brew_cache
...@@ -204,7 +206,7 @@ matrix: ...@@ -204,7 +206,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
workspaces: workspaces:
...@@ -212,7 +214,7 @@ matrix: ...@@ -212,7 +214,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
workspaces: workspaces:
...@@ -220,18 +222,19 @@ matrix: ...@@ -220,18 +222,19 @@ matrix:
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5
workspaces: workspaces:
use: brew_cache use: brew_cache
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
workspaces: workspaces:
use: brew_cache use: brew_cache
...@@ -270,14 +273,14 @@ matrix: ...@@ -270,14 +273,14 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
...@@ -285,51 +288,53 @@ matrix: ...@@ -285,51 +288,53 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.11.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.11.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
...@@ -368,14 +373,14 @@ matrix: ...@@ -368,14 +373,14 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
...@@ -383,51 +388,53 @@ matrix: ...@@ -383,51 +388,53 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.11.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.11.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=0 - ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
...@@ -466,14 +473,14 @@ matrix: ...@@ -466,14 +473,14 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
...@@ -481,49 +488,51 @@ matrix: ...@@ -481,49 +488,51 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- TEST_DEPENDS=numpy==1.11.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- PLAT=i686 - PLAT=i686
- TEST_DEPENDS=numpy==1.11.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- PLAT=i686 - PLAT=i686
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- PLAT=i686 - PLAT=i686
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0 - ENABLE_HEADLESS=0
cache: cache:
...@@ -565,14 +574,14 @@ matrix: ...@@ -565,14 +574,14 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- PLAT=i686 - PLAT=i686
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
...@@ -580,49 +589,51 @@ matrix: ...@@ -580,49 +589,51 @@ matrix:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- TEST_DEPENDS=numpy==1.11.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- PLAT=i686 - PLAT=i686
- TEST_DEPENDS=numpy==1.11.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.7
- PLAT=i686 - PLAT=i686
- TEST_DEPENDS=numpy==1.11.3 - TEST_DEPENDS=numpy==1.14.5
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
directories: $HOME/.ccache directories: $HOME/.ccache
- os: linux - os: linux
env: env:
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.8
- PLAT=i686 - PLAT=i686
- TEST_DEPENDS=numpy==1.14.5 - TEST_DEPENDS=numpy==1.17.3
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1 - ENABLE_HEADLESS=1
cache: cache:
...@@ -635,16 +646,20 @@ before_install: | ...@@ -635,16 +646,20 @@ before_install: |
# Multibuild doesn't have releases, so --depth would break eventually (see # Multibuild doesn't have releases, so --depth would break eventually (see
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised) # https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
git submodule update --init multibuild git submodule update --init multibuild
echo "Source multibuild/common_utils.sh"
source multibuild/common_utils.sh source multibuild/common_utils.sh
# https://github.com/matthew-brett/multibuild/issues/116 # https://github.com/matthew-brett/multibuild/issues/116
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
echo "Source multibuild/travis_steps.sh"
source multibuild/travis_steps.sh source multibuild/travis_steps.sh
# This sets -x # This sets -x
echo "Source travis_multibuild_customize.sh"
source travis_multibuild_customize.sh source travis_multibuild_customize.sh
echo $ENABLE_CONTRIB > contrib.enabled echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled echo $ENABLE_HEADLESS > headless.enabled
if [ -n "$IS_OSX" ]; then if [ -n "$IS_OSX" ]; then
echo "homebrew"
TAPS="$(brew --repository)/Library/Taps" TAPS="$(brew --repository)/Library/Taps"
if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
rm -rf "$TAPS/caskroom/homebrew-cask" rm -rf "$TAPS/caskroom/homebrew-cask"
...@@ -658,7 +673,7 @@ before_install: | ...@@ -658,7 +673,7 @@ before_install: |
brew_cache_cleanup brew_cache_cleanup
fi fi
echo "end"
# Not interested in travis internal scripts' output # Not interested in travis internal scripts' output
set +x set +x
......
README.md
浏览文件 @ 50c4fe32
...@@ -134,7 +134,7 @@ Linux and MacOS wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) l ...@@ -134,7 +134,7 @@ Linux and MacOS wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) l
### Releases ### Releases
A release is made and uploaded to PyPI when a new tag is pushed to the repo. These tags differentiate packages (this repo might have modifications but OpenCV version stays same) and should be incremented sequentially. In practice, release version numbers look like this: A release is made and uploaded to PyPI when a new tag is pushed to master branch. These tags differentiate packages (this repo might have modifications but OpenCV version stays same) and should be incremented sequentially. In practice, release version numbers look like this:
``cv_major.cv_minor.cv_revision.package_revision`` e.g. ``3.1.0.0`` ``cv_major.cv_minor.cv_revision.package_revision`` e.g. ``3.1.0.0``
...@@ -158,12 +158,12 @@ The default ``manylinux`` images have been extended with some OpenCV dependencie ...@@ -158,12 +158,12 @@ The default ``manylinux`` images have been extended with some OpenCV dependencie
Python 2.7 is the only supported version in 2.x series. Python 2.7 support will be dropped in the end of 2019. Python 2.7 is the only supported version in 2.x series. Python 2.7 support will be dropped in the end of 2019.
Python 3.x releases follow Numpy releases. For example Python 3.3 is no longer supported by Numpy so support for it has been dropped in ``opencv-python``, too. Python 3.x releases are provided for officially supported versions (not in EOL).
Currently, builds for following Python versions are provided: Currently, builds for following Python versions are provided:
- 2.7 - 2.7
- 3.4
- 3.5 - 3.5
- 3.6 - 3.6
- 3.7 - 3.7
- 3.8
appveyor.yml
浏览文件 @ 50c4fe32
...@@ -14,14 +14,6 @@ environment: ...@@ -14,14 +14,6 @@ environment:
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python34"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python34-x64"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python35" - PYTHON: "C:/Python35"
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
...@@ -46,19 +38,19 @@ environment: ...@@ -46,19 +38,19 @@ environment:
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python27" - PYTHON: "C:/Python38"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python27-x64" - PYTHON: "C:/Python38-x64"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python34" - PYTHON: "C:/Python27"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python34-x64" - PYTHON: "C:/Python27-x64"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
...@@ -86,19 +78,19 @@ environment: ...@@ -86,19 +78,19 @@ environment:
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python27" - PYTHON: "C:/Python38"
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python27-x64" - PYTHON: "C:/Python38-x64"
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 0
- PYTHON: "C:/Python34" - PYTHON: "C:/Python27"
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
- PYTHON: "C:/Python34-x64" - PYTHON: "C:/Python27-x64"
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
...@@ -126,19 +118,19 @@ environment: ...@@ -126,19 +118,19 @@ environment:
ENABLE_CONTRIB: 0 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
- PYTHON: "C:/Python27" - PYTHON: "C:/Python38"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
- PYTHON: "C:/Python27-x64" - PYTHON: "C:/Python38-x64"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
- PYTHON: "C:/Python34" - PYTHON: "C:/Python27"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
- PYTHON: "C:/Python34-x64" - PYTHON: "C:/Python27-x64"
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
...@@ -166,6 +158,14 @@ environment: ...@@ -166,6 +158,14 @@ environment:
ENABLE_CONTRIB: 1 ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1 ENABLE_HEADLESS: 1
- PYTHON: "C:/Python38"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python38-x64"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
matrix: matrix:
fast_finish: true fast_finish: true
......
multibuild @ 68a4af04
比较 951b6c64...68a4af04
Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b Subproject commit 68a4af043e2adb0d9353d4a0e1f3d871203237aa
opencv @ ddbd10c0
比较 4a7ca5a2...ddbd10c0
Subproject commit 4a7ca5a291038a773ea0b67eaf6fbed9ad72170b Subproject commit ddbd10c0019f3ee5f43b7902d47e7fc4303a6574
opencv_contrib @ 0915b7ea
比较 6d656ca0...0915b7ea
Subproject commit 6d656ca069afb3a3cb43a3484ee3a2d215982997 Subproject commit 0915b7eaddba3c06d83e201c9a7595e73801f417
setup.py
浏览文件 @ 50c4fe32
...@@ -28,6 +28,8 @@ def main(): ...@@ -28,6 +28,8 @@ def main():
minimum_supported_numpy = "1.11.3" minimum_supported_numpy = "1.11.3"
if sys.version_info[:2] >= (3, 7): if sys.version_info[:2] >= (3, 7):
minimum_supported_numpy = "1.14.5" minimum_supported_numpy = "1.14.5"
if sys.version_info[:2] >= (3, 8):
minimum_supported_numpy = "1.17.3"
numpy_version = get_or_install("numpy", minimum_supported_numpy) numpy_version = get_or_install("numpy", minimum_supported_numpy)
get_or_install("scikit-build") get_or_install("scikit-build")
...@@ -76,14 +78,14 @@ def main(): ...@@ -76,14 +78,14 @@ def main():
# Path regexes with forward slashes relative to CMake install dir. # Path regexes with forward slashes relative to CMake install dir.
rearrange_cmake_output_data = { rearrange_cmake_output_data = {
'cv2': ([r'bin/opencv_ffmpeg\d{3}%s\.dll' % ('_64' if x64 else '')] if os.name == 'nt' else []) + 'cv2': ([r'bin/opencv_videoio_ffmpeg\d{3}%s\.dll' % ('_64' if x64 else '')] if os.name == 'nt' else []) +
# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/. # In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
# Naming conventions vary so widely between versions and OSes # Naming conventions vary so widely between versions and OSes
# had to give up on checking them. # had to give up on checking them.
['python/cv2[^/]*%(ext)s' % {'ext': re.escape(sysconfig.get_config_var('SO'))}], ['python/cv2[^/]*%(ext)s' % {'ext': re.escape(sysconfig.get_config_var('SO'))}],
'cv2.data': [ # OPENCV_OTHER_INSTALL_PATH 'cv2.data': [ # OPENCV_OTHER_INSTALL_PATH
('etc' if os.name == 'nt' else 'share/OpenCV') + ('etc' if os.name == 'nt' else 'share/opencv4') +
r'/haarcascades/.*\.xml' r'/haarcascades/.*\.xml'
] ]
} }
...@@ -138,7 +140,7 @@ def main(): ...@@ -138,7 +140,7 @@ def main():
cmake_args.append("-DWITH_LAPACK=OFF") # Some OSX LAPACK fns are incompatible, see cmake_args.append("-DWITH_LAPACK=OFF") # Some OSX LAPACK fns are incompatible, see
# https://github.com/skvark/opencv-python/issues/21 # https://github.com/skvark/opencv-python/issues/21
cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++") cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++")
cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8") cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9")
if sys.platform == 'darwin' and build_contrib: if sys.platform == 'darwin' and build_contrib:
cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++ -std=c++11 -Wno-c++11-narrowing") cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++ -std=c++11 -Wno-c++11-narrowing")
...@@ -201,10 +203,10 @@ def main(): ...@@ -201,10 +203,10 @@ def main():
'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: C++', 'Programming Language :: C++',
'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: CPython',
'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering',
......
travis_config.sh
浏览文件 @ 50c4fe32
...@@ -64,8 +64,8 @@ if [ -n "$IS_OSX" ]; then ...@@ -64,8 +64,8 @@ if [ -n "$IS_OSX" ]; then
if (!$found_blank && /^$/) {$_.="conflicts_with \"ffmpeg\"\n\n"; $found_blank=1; next;} if (!$found_blank && /^$/) {$_.="conflicts_with \"ffmpeg\"\n\n"; $found_blank=1; next;}
if (!$bottle_block && /^\s*bottle do$/) { $bottle_block=1; next; } if (!$bottle_block && /^\s*bottle do$/) { $bottle_block=1; next; }
if ($bottle_block) { if (/^\s*end\s*$/) { $bottle_block=0} elsif (/^\s*sha256\s/) {$_=""} next; } if ($bottle_block) { if (/^\s*end\s*$/) { $bottle_block=0} elsif (/^\s*sha256\s/) {$_=""} next; }
if (/^\s*depends_on "(x264|x265|xvid|frei0r|rubberband)"$/) {$_=""; next;} if (/^\s*depends_on "(x264|x265|xvid|frei0r|rubberband|libvidstab)"$/) {$_=""; next;}
if (/^\s*--enable-(gpl|libx264|libx265|libxvid|frei0r|librubberband)$/) {$_=""; next;} if (/^\s*--enable-(gpl|libx264|libx265|libxvid|frei0r|librubberband|libvidstab)$/) {$_=""; next;}
' <"$FF_FORMULA" >"$LFF_FORMULA" ' <"$FF_FORMULA" >"$LFF_FORMULA"
diff -u "$FF_FORMULA" "$LFF_FORMULA" || test $? -le 1 diff -u "$FF_FORMULA" "$LFF_FORMULA" || test $? -le 1
...@@ -86,7 +86,7 @@ function pre_build { ...@@ -86,7 +86,7 @@ function pre_build {
if [ -n "$IS_OSX" ]; then if [ -n "$IS_OSX" ]; then
echo "Running for OSX" echo "Running for OSX"
local CACHE_STAGE; (echo "$TRAVIS_BUILD_STAGE_NAME" | grep -qiF "final") || CACHE_STAGE=1 local CACHE_STAGE; (echo "$TRAVIS_BUILD_STAGE_NAME" | grep -qiF "final") || CACHE_STAGE=1
#after the cache stage, all bottles and Homebrew metadata should be already cached locally #after the cache stage, all bottles and Homebrew metadata should be already cached locally
...@@ -117,7 +117,7 @@ function pre_build { ...@@ -117,7 +117,7 @@ function pre_build {
brew_go_bootstrap_mode 0 brew_go_bootstrap_mode 0
return 0 return 0
fi fi
# Have to install macpython late to avoid conflict with Homebrew Python update # Have to install macpython late to avoid conflict with Homebrew Python update
before_install before_install
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或