From e2d41163a6fb73c9f1437066018c7527c8d3b192 Mon Sep 17 00:00:00 2001
From: Swind <swind@cloudmosa.com>
Date: Thu, 6 Dec 2018 11:43:24 +0800
Subject: [PATCH 1/8] Remove unused python version
---
.travis.yml | 490 +---------------------------------------------------
setup.py | 3 +
2 files changed, 4 insertions(+), 489 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a6fb537d..625fd2e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,110 +37,7 @@ cache:
matrix:
fast_finish: true
include:
-
- # default builds for MacOS
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.6
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - TEST_DEPENDS=numpy==1.14.5
-
- # headless builds for MacOS
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.6
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - TEST_DEPENDS=numpy==1.14.5
-
# Contrib builds for MacOS
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
@@ -167,293 +64,7 @@ matrix:
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- TEST_DEPENDS=numpy==1.14.5
- # headless contrib builds for MacOS
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.6
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.7
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - TEST_DEPENDS=numpy==1.14.5
-
- # default builds for Linux
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - TEST_DEPENDS=numpy==1.11.3
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - TEST_DEPENDS=numpy==1.11.3
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - TEST_DEPENDS=numpy==1.14.5
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=0
- - TEST_DEPENDS=numpy==1.14.5
- cache:
- directories: $HOME/.ccache
-
- # headless builds for Linux
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - TEST_DEPENDS=numpy==1.11.3
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - TEST_DEPENDS=numpy==1.11.3
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - TEST_DEPENDS=numpy==1.14.5
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - PLAT=i686
- - ENABLE_CONTRIB=0
- - ENABLE_HEADLESS=1
- - TEST_DEPENDS=numpy==1.14.5
- cache:
- directories: $HOME/.ccache
-
# contrib builds for Linux
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - PLAT=i686
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=3.5
@@ -504,105 +115,6 @@ matrix:
cache:
directories: $HOME/.ccache
-
- # headless contrib builds for Linux
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=2.7
- - PLAT=i686
- - UNICODE_WIDTH=16
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.4
- - PLAT=i686
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - PLAT=i686
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - TEST_DEPENDS=numpy==1.11.3
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - PLAT=i686
- - TEST_DEPENDS=numpy==1.11.3
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - TEST_DEPENDS=numpy==1.14.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - PLAT=i686
- - TEST_DEPENDS=numpy==1.14.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=1
- cache:
- directories: $HOME/.ccache
-
# The first line is printed in the folding header in Travis output
before_install: |
# Check out and prepare the source
@@ -695,7 +207,7 @@ after_success: |
fi
fi
- twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
+ #twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
set +x
else
echo "Tag not set, deployment skipped."
diff --git a/setup.py b/setup.py
index bc405e00..b610eedc 100644
--- a/setup.py
+++ b/setup.py
@@ -144,6 +144,9 @@ def main():
# devtoolset-2 GCC 4.8.2 or vanilla GCC 4.9.4
# see https://github.com/skvark/opencv-python/issues/138
+ # Enable nonfree algorithms
+ cmake_args.append("-DOPENCV_ENABLE_NONFREE=ON")
+
# ABI config variables are introduced in PEP 425
if sys.version_info[:2] < (3, 2):
import warnings
From 7a7459ac5d566898b29f7736dffb37c503f1a5e4 Mon Sep 17 00:00:00 2001
From: Swind <swind@cloudmosa.com>
Date: Thu, 6 Dec 2018 13:41:16 +0800
Subject: [PATCH 2/8] Upload the wheel to github release
---
.travis.yml | 344 +++++++++++++++++++++++-----------------------------
1 file changed, 149 insertions(+), 195 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 625fd2e7..2c05c58d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,214 +1,168 @@
env:
- global:
- - "PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'"
- # pip dependencies to _test_ your project
- - TEST_DEPENDS="numpy==1.11.1"
- # params to bdist_wheel. used to set osx build target.
- - BDIST_PARAMS=""
- - USE_CCACHE=1
- - PLAT=x86_64
- - UNICODE_WIDTH=32
-
-
-# Host Python is never used
+ global:
+ - 'PS4=''+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'''
+ - TEST_DEPENDS="numpy==1.11.1"
+ - BDIST_PARAMS=""
+ - USE_CCACHE=1
+ - PLAT=x86_64
+ - UNICODE_WIDTH=32
language: generic
-# Required to invoke docker ourselves as per https://docs.travis-ci.com/user/docker/
sudo: required
services: docker
-# https://docs.travis-ci.com/user/reference/trusty/
dist: trusty
-
-# Save some time, we and setup check them out on demand instead
-# https://docs.travis-ci.com/user/customizing-the-build/#Git-Clone-Depth
git:
- submodules: false
-
-# https://docs.travis-ci.com/user/caching
+ submodules: false
cache:
directories:
- # https://stackoverflow.com/questions/39930171/cache-brew-builds-with-travis-ci
- - $HOME/Library/Caches/Homebrew
- - /usr/local/Homebrew/
- # used in OSX custom build script dealing with local bottle caching
- - $HOME/local_bottle_metadata
- # `cache: ccache: true` has no effect if `language:` is not `c` or `cpp`
- - $HOME/.ccache
-
+ - "$HOME/Library/Caches/Homebrew"
+ - "/usr/local/Homebrew/"
+ - "$HOME/local_bottle_metadata"
+ - "$HOME/.ccache"
matrix:
fast_finish: true
include:
- # Contrib builds for MacOS
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.6
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.7
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - TEST_DEPENDS=numpy==1.14.5
-
- # contrib builds for Linux
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.5
- - PLAT=i686
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - TEST_DEPENDS=numpy==1.11.3
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.6
- - PLAT=i686
- - TEST_DEPENDS=numpy==1.11.3
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - TEST_DEPENDS=numpy==1.14.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - PLAT=i686
- - TEST_DEPENDS=numpy==1.14.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: $HOME/.ccache
-
-# The first line is printed in the folding header in Travis output
-before_install: |
- # Check out and prepare the source
- set -e
- # Multibuild doesn't have releases, so --depth would break eventually (see
- # https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
- git submodule update --init multibuild
- source multibuild/common_utils.sh
- # https://github.com/matthew-brett/multibuild/issues/116
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
- source multibuild/travis_steps.sh
- # This sets -x
- source multibuild_customize.sh
- echo $ENABLE_CONTRIB > contrib.enabled
- echo $ENABLE_HEADLESS > headless.enabled
-
- if [ -n "$IS_OSX" ]; then
- TAPS="$(brew --repository)/Library/Taps"
- if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
- rm -rf "$TAPS/caskroom/homebrew-cask"
- fi
- find "$TAPS" -type d -name .git -exec \
- bash -xec '
- cd $(dirname '\''{}'\'')
- git clean -fxd
- git status' \;
-
- brew_cache_cleanup
- fi
-
- before_install
- # Not interested in travis internal scripts' output
- set +x
-
+ - os: osx
+ language: generic
+ osx_image: xcode8
+ env:
+ - MB_PYTHON_VERSION=3.5
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
+ - os: osx
+ language: generic
+ osx_image: xcode8
+ env:
+ - MB_PYTHON_VERSION=3.6
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
+ - os: osx
+ language: generic
+ osx_image: xcode8
+ env:
+ - MB_PYTHON_VERSION=3.7
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
+ - TEST_DEPENDS=numpy==1.14.5
+ - os: linux
+ env:
+ - MB_PYTHON_VERSION=3.5
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ cache:
+ directories: "$HOME/.ccache"
+ - os: linux
+ env:
+ - MB_PYTHON_VERSION=3.5
+ - PLAT=i686
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ cache:
+ directories: "$HOME/.ccache"
+ - os: linux
+ env:
+ - MB_PYTHON_VERSION=3.6
+ - TEST_DEPENDS=numpy==1.11.3
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ cache:
+ directories: "$HOME/.ccache"
+ - os: linux
+ env:
+ - MB_PYTHON_VERSION=3.6
+ - PLAT=i686
+ - TEST_DEPENDS=numpy==1.11.3
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ cache:
+ directories: "$HOME/.ccache"
+ - os: linux
+ env:
+ - MB_PYTHON_VERSION=3.7
+ - TEST_DEPENDS=numpy==1.14.5
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ cache:
+ directories: "$HOME/.ccache"
+ - os: linux
+ env:
+ - MB_PYTHON_VERSION=3.7
+ - PLAT=i686
+ - TEST_DEPENDS=numpy==1.14.5
+ - ENABLE_CONTRIB=1
+ - ENABLE_HEADLESS=0
+ cache:
+ directories: "$HOME/.ccache"
+before_install: "# Check out and prepare the source\nset -e\n# Multibuild doesn't
+ have releases, so --depth would break eventually (see\n# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)\ngit
+ submodule update --init multibuild\nsource multibuild/common_utils.sh\n# https://github.com/matthew-brett/multibuild/issues/116\nif
+ [[ \"$TRAVIS_OS_NAME\" == \"osx\" ]]; then export ARCH_FLAGS=\" \"; fi\nsource multibuild/travis_steps.sh\n#
+ This sets -x\nsource multibuild_customize.sh\necho $ENABLE_CONTRIB > contrib.enabled\necho
+ $ENABLE_HEADLESS > headless.enabled\n\nif [ -n \"$IS_OSX\" ]; then\n TAPS=\"$(brew
+ --repository)/Library/Taps\"\n if [ -e \"$TAPS/caskroom/homebrew-cask\" -a -e
+ \"$TAPS/homebrew/homebrew-cask\" ]; then\n rm -rf \"$TAPS/caskroom/homebrew-cask\"\n
+ \ fi\n find \"$TAPS\" -type d -name .git -exec \\\n bash -xec '\n
+ \ cd $(dirname '\\''{}'\\'')\n git clean -fxd\n git
+ status' \\;\n \n brew_cache_cleanup\nfi\n\nbefore_install\n# Not
+ interested in travis internal scripts' output\nset +x\n"
install: |
- # Build and package
- set -x
- build_wheel $REPO_DIR $PLAT
- if [ -n "$USE_CCACHE" ]; then ccache --show-stats; fi
- set +x
-
+ # Build and package
+ set -x
+ build_wheel $REPO_DIR $PLAT
+ if [ -n "$USE_CCACHE" ]; then ccache --show-stats; fi
+ set +x
script: |
- # Install and run tests
- set -x
- install_run $PLAT && rc=$? || rc=$?
- set +x
-
- #otherwise, Travis logic terminates prematurely
- #https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
- trap ERR
-
- test "$rc" -eq 0
-
-before_cache: |
- # Cleanup dirs to be cached
- set -x
- if [ -n "$IS_OSX" ]; then
+ # Install and run tests
+ set -x
+ install_run $PLAT && rc=$? || rc=$?
+ set +x
- # When Taps is cached, this dir causes "Error: file exists" on `brew update`
- if [ -e "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask" ]; then
- rm -rf "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask"
- fi
+ #otherwise, Travis logic terminates prematurely
+ #https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
+ trap ERR
- brew_cache_cleanup
-
- fi
- set +x
-
+ test "$rc" -eq 0
+before_cache: "# Cleanup dirs to be cached\nset -x\nif [ -n \"$IS_OSX\" ]; then\n\n
+ \ # When Taps is cached, this dir causes \"Error: file exists\" on `brew update`\n
+ \ if [ -e \"$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask\"
+ ]; then\n rm -rf \"$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask\"\n
+ \ fi\n\n brew_cache_cleanup\n \nfi\nset +x\n"
after_success: |
- # Upload wheels to pypi if requested
- if [ -n "$TRAVIS_TAG" ]; then
- set -x
- pip install twine
+ # Upload wheels to pypi if requested
+ if [ -n "$TRAVIS_TAG" ]; then
+ set -x
+ pip install twine
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
- pip install --upgrade pyOpenSSL
- fi
+ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+ pip install --upgrade pyOpenSSL
+ fi
- if [[ $ENABLE_CONTRIB == 0 ]]; then
- if [[ $ENABLE_HEADLESS == 0 ]]; then
- echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
- else
- echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
- fi
- else
- if [[ $ENABLE_HEADLESS == 0 ]]; then
- echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
- else
- echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
- fi
- fi
+ if [[ $ENABLE_CONTRIB == 0 ]]; then
+ if [[ $ENABLE_HEADLESS == 0 ]]; then
+ echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
+ else
+ echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
+ fi
+ else
+ if [[ $ENABLE_HEADLESS == 0 ]]; then
+ echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
+ else
+ echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
+ fi
+ fi
- #twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
- set +x
- else
- echo "Tag not set, deployment skipped."
- fi
+ #twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
+ set +x
+ else
+ echo "Tag not set, deployment skipped."
+ fi
+deploy:
+ provider: releases
+ api_key:
+ secure: AtM2g/4gJz2ZR4z6+p9GOkUiBIQGKgpJvkq48CgAeTTjEX0CXxn5XSwat4U8Sxr2QEiWj7giRsZlwW8P5TyPXAZ/R7oy1/hsfHQPpz9PKfrKFRpchgWdqiKfyTJwcTcEgo5VIhWmsnvXhbaQZPRnvAhvZ0b3wHfx/ymbsoyD1oyLJMDWq+K8bPvXni+A+vzv+PsSM4kF+AscjSO3ntVs6lBu7PiXFuz9vmmUY7jDkty3GmPzKA1wav1WNvWklSfiiIZvtGU2wj9iUClhYMibzY9lH4fowG9R2m6L3NjtefFCS17XhANKh6iEm3jVVifMjRvThCuYorEC67HDK3RLVJgwGhGWC5Jbr4Xc7aFTgd7lIftHL/alNcmLmiOpGcle45Uc1sdih1e0r5kkoszUAH+QNBXlN10ayNIP/z8iLv6LgT0qj0RIxvqleAJKawohhPqIPNVeSd+v+Vn7l7zbiYtiiZy03a94nvh1IbXPi6p2QB2uGy1/+3B9eipPiA9yamQh5dx2qP4j30iFUh4kMU2KIPfu2w6es+P5/TCVEebZwD1KqERBlKOCAW4g5EGg4qO2AXKN7as7VBge6KITSUSJogc5GhMgyd0tclON60vLeLpEyVv/C2Sq24WDuS8uy9IFm0vs1pzkCmBxEpFxvOyh20eWkVIpOfVPs27U/l0=
+ file: "${TRAVIS_BUILD_DIR}/wheelhouse/opencv/*"
+ on:
+ repo: Swind/opencv-python
+ branch: nonfree
From d9a77d338e502dbc197343f169d70dffc3822ced Mon Sep 17 00:00:00 2001
From: Swind <swind@cloudmosa.com>
Date: Thu, 6 Dec 2018 15:31:22 +0800
Subject: [PATCH 3/8] 1. Add file_glob to .travis.yml 2. only build opencv from
python 3.5 and 3.6
---
.travis.yml | 45 +++------------------------------------------
1 file changed, 3 insertions(+), 42 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2c05c58d..8d3927bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,31 +21,6 @@ cache:
matrix:
fast_finish: true
include:
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.6
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - os: osx
- language: generic
- osx_image: xcode8
- env:
- - MB_PYTHON_VERSION=3.7
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- - TEST_DEPENDS=numpy==1.14.5
- os: linux
env:
- MB_PYTHON_VERSION=3.5
@@ -78,23 +53,7 @@ matrix:
- ENABLE_HEADLESS=0
cache:
directories: "$HOME/.ccache"
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - TEST_DEPENDS=numpy==1.14.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: "$HOME/.ccache"
- - os: linux
- env:
- - MB_PYTHON_VERSION=3.7
- - PLAT=i686
- - TEST_DEPENDS=numpy==1.14.5
- - ENABLE_CONTRIB=1
- - ENABLE_HEADLESS=0
- cache:
- directories: "$HOME/.ccache"
+
before_install: "# Check out and prepare the source\nset -e\n# Multibuild doesn't
have releases, so --depth would break eventually (see\n# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)\ngit
submodule update --init multibuild\nsource multibuild/common_utils.sh\n# https://github.com/matthew-brett/multibuild/issues/116\nif
@@ -158,10 +117,12 @@ after_success: |
else
echo "Tag not set, deployment skipped."
fi
+
deploy:
provider: releases
api_key:
secure: AtM2g/4gJz2ZR4z6+p9GOkUiBIQGKgpJvkq48CgAeTTjEX0CXxn5XSwat4U8Sxr2QEiWj7giRsZlwW8P5TyPXAZ/R7oy1/hsfHQPpz9PKfrKFRpchgWdqiKfyTJwcTcEgo5VIhWmsnvXhbaQZPRnvAhvZ0b3wHfx/ymbsoyD1oyLJMDWq+K8bPvXni+A+vzv+PsSM4kF+AscjSO3ntVs6lBu7PiXFuz9vmmUY7jDkty3GmPzKA1wav1WNvWklSfiiIZvtGU2wj9iUClhYMibzY9lH4fowG9R2m6L3NjtefFCS17XhANKh6iEm3jVVifMjRvThCuYorEC67HDK3RLVJgwGhGWC5Jbr4Xc7aFTgd7lIftHL/alNcmLmiOpGcle45Uc1sdih1e0r5kkoszUAH+QNBXlN10ayNIP/z8iLv6LgT0qj0RIxvqleAJKawohhPqIPNVeSd+v+Vn7l7zbiYtiiZy03a94nvh1IbXPi6p2QB2uGy1/+3B9eipPiA9yamQh5dx2qP4j30iFUh4kMU2KIPfu2w6es+P5/TCVEebZwD1KqERBlKOCAW4g5EGg4qO2AXKN7as7VBge6KITSUSJogc5GhMgyd0tclON60vLeLpEyVv/C2Sq24WDuS8uy9IFm0vs1pzkCmBxEpFxvOyh20eWkVIpOfVPs27U/l0=
+ file_glob: true
file: "${TRAVIS_BUILD_DIR}/wheelhouse/opencv/*"
on:
repo: Swind/opencv-python
From 87815ef0624e7eb35bd6046059d5c7beb63112b1 Mon Sep 17 00:00:00 2001
From: Swind <swind@cloudmosa.com>
Date: Thu, 6 Dec 2018 16:55:33 +0800
Subject: [PATCH 4/8] Add tags=true to .travis.yml
---
.travis.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8d3927bd..8cabfdbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -117,7 +117,6 @@ after_success: |
else
echo "Tag not set, deployment skipped."
fi
-
deploy:
provider: releases
api_key:
@@ -126,4 +125,4 @@ deploy:
file: "${TRAVIS_BUILD_DIR}/wheelhouse/opencv/*"
on:
repo: Swind/opencv-python
- branch: nonfree
+ tags: true
From f75e4f25e87e4b2feba2643d8596dc5919855b61 Mon Sep 17 00:00:00 2001
From: Swind <swind@cloudmosa.com>
Date: Sat, 8 Dec 2018 15:49:36 +0800
Subject: [PATCH 5/8] reformat .travis.yml
---
.travis.yml | 100 +++++++++++++++++++++++++++++-----------------------
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8cabfdbe..62306b49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,25 @@ env:
- USE_CCACHE=1
- PLAT=x86_64
- UNICODE_WIDTH=32
+
language: generic
+
sudo: required
+
services: docker
+
dist: trusty
+
git:
submodules: false
+
cache:
directories:
- "$HOME/Library/Caches/Homebrew"
- "/usr/local/Homebrew/"
- "$HOME/local_bottle_metadata"
- "$HOME/.ccache"
+
matrix:
fast_finish: true
include:
@@ -54,24 +61,47 @@ matrix:
cache:
directories: "$HOME/.ccache"
-before_install: "# Check out and prepare the source\nset -e\n# Multibuild doesn't
- have releases, so --depth would break eventually (see\n# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)\ngit
- submodule update --init multibuild\nsource multibuild/common_utils.sh\n# https://github.com/matthew-brett/multibuild/issues/116\nif
- [[ \"$TRAVIS_OS_NAME\" == \"osx\" ]]; then export ARCH_FLAGS=\" \"; fi\nsource multibuild/travis_steps.sh\n#
- This sets -x\nsource multibuild_customize.sh\necho $ENABLE_CONTRIB > contrib.enabled\necho
- $ENABLE_HEADLESS > headless.enabled\n\nif [ -n \"$IS_OSX\" ]; then\n TAPS=\"$(brew
- --repository)/Library/Taps\"\n if [ -e \"$TAPS/caskroom/homebrew-cask\" -a -e
- \"$TAPS/homebrew/homebrew-cask\" ]; then\n rm -rf \"$TAPS/caskroom/homebrew-cask\"\n
- \ fi\n find \"$TAPS\" -type d -name .git -exec \\\n bash -xec '\n
- \ cd $(dirname '\\''{}'\\'')\n git clean -fxd\n git
- status' \\;\n \n brew_cache_cleanup\nfi\n\nbefore_install\n# Not
- interested in travis internal scripts' output\nset +x\n"
+# The first line is printed in the folding header in Travis output
+before_install: |
+ # Check out and prepare the source
+ set -e
+ # Multibuild doesn't have releases, so --depth would break eventually (see
+ # https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
+ git submodule update --init multibuild
+ source multibuild/common_utils.sh
+ # https://github.com/matthew-brett/multibuild/issues/116
+ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
+ source multibuild/travis_steps.sh
+ # This sets -x
+ source multibuild_customize.sh
+ echo $ENABLE_CONTRIB > contrib.enabled
+ echo $ENABLE_HEADLESS > headless.enabled
+
+ if [ -n "$IS_OSX" ]; then
+ TAPS="$(brew --repository)/Library/Taps"
+ if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
+ rm -rf "$TAPS/caskroom/homebrew-cask"
+ fi
+ find "$TAPS" -type d -name .git -exec \
+ bash -xec '
+ cd $(dirname '\''{}'\'')
+ git clean -fxd
+ git status' \;
+
+ brew_cache_cleanup
+ fi
+
+ before_install
+ # Not interested in travis internal scripts' output
+ set +x
+
install: |
# Build and package
set -x
build_wheel $REPO_DIR $PLAT
if [ -n "$USE_CCACHE" ]; then ccache --show-stats; fi
set +x
+
script: |
# Install and run tests
set -x
@@ -83,46 +113,26 @@ script: |
trap ERR
test "$rc" -eq 0
-before_cache: "# Cleanup dirs to be cached\nset -x\nif [ -n \"$IS_OSX\" ]; then\n\n
- \ # When Taps is cached, this dir causes \"Error: file exists\" on `brew update`\n
- \ if [ -e \"$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask\"
- ]; then\n rm -rf \"$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask\"\n
- \ fi\n\n brew_cache_cleanup\n \nfi\nset +x\n"
-after_success: |
- # Upload wheels to pypi if requested
- if [ -n "$TRAVIS_TAG" ]; then
- set -x
- pip install twine
-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
- pip install --upgrade pyOpenSSL
- fi
- if [[ $ENABLE_CONTRIB == 0 ]]; then
- if [[ $ENABLE_HEADLESS == 0 ]]; then
- echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
- else
- echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
- fi
- else
- if [[ $ENABLE_HEADLESS == 0 ]]; then
- echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
- else
- echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
- fi
- fi
+before_cache: |
+ # Cleanup dirs to be cached
+ set -x
+ if [ -n "$IS_OSX" ]; then
+ # When Taps is cached, this dir causes "Error: file exists" on `brew update`
+ if [ -e "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask" ]; then
+ rm -rf "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask"
+ fi
+ brew_cache_cleanup
+
+ fi
+ set +x
- #twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
- set +x
- else
- echo "Tag not set, deployment skipped."
- fi
deploy:
provider: releases
api_key:
secure: AtM2g/4gJz2ZR4z6+p9GOkUiBIQGKgpJvkq48CgAeTTjEX0CXxn5XSwat4U8Sxr2QEiWj7giRsZlwW8P5TyPXAZ/R7oy1/hsfHQPpz9PKfrKFRpchgWdqiKfyTJwcTcEgo5VIhWmsnvXhbaQZPRnvAhvZ0b3wHfx/ymbsoyD1oyLJMDWq+K8bPvXni+A+vzv+PsSM4kF+AscjSO3ntVs6lBu7PiXFuz9vmmUY7jDkty3GmPzKA1wav1WNvWklSfiiIZvtGU2wj9iUClhYMibzY9lH4fowG9R2m6L3NjtefFCS17XhANKh6iEm3jVVifMjRvThCuYorEC67HDK3RLVJgwGhGWC5Jbr4Xc7aFTgd7lIftHL/alNcmLmiOpGcle45Uc1sdih1e0r5kkoszUAH+QNBXlN10ayNIP/z8iLv6LgT0qj0RIxvqleAJKawohhPqIPNVeSd+v+Vn7l7zbiYtiiZy03a94nvh1IbXPi6p2QB2uGy1/+3B9eipPiA9yamQh5dx2qP4j30iFUh4kMU2KIPfu2w6es+P5/TCVEebZwD1KqERBlKOCAW4g5EGg4qO2AXKN7as7VBge6KITSUSJogc5GhMgyd0tclON60vLeLpEyVv/C2Sq24WDuS8uy9IFm0vs1pzkCmBxEpFxvOyh20eWkVIpOfVPs27U/l0=
file_glob: true
- file: "${TRAVIS_BUILD_DIR}/wheelhouse/opencv/*"
+ file: "${TRAVIS_BUILD_DIR}/dist"
on:
repo: Swind/opencv-python
tags: true
From f4d2139948f4595ec358bbefe44d084f52a6384e Mon Sep 17 00:00:00 2001
From: Swind <swind@code-life.info>
Date: Sun, 9 Dec 2018 00:57:04 +0800
Subject: [PATCH 6/8] Update .travis.yml
Set skip_cleanup to true
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index 62306b49..096141c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,6 +133,7 @@ deploy:
secure: AtM2g/4gJz2ZR4z6+p9GOkUiBIQGKgpJvkq48CgAeTTjEX0CXxn5XSwat4U8Sxr2QEiWj7giRsZlwW8P5TyPXAZ/R7oy1/hsfHQPpz9PKfrKFRpchgWdqiKfyTJwcTcEgo5VIhWmsnvXhbaQZPRnvAhvZ0b3wHfx/ymbsoyD1oyLJMDWq+K8bPvXni+A+vzv+PsSM4kF+AscjSO3ntVs6lBu7PiXFuz9vmmUY7jDkty3GmPzKA1wav1WNvWklSfiiIZvtGU2wj9iUClhYMibzY9lH4fowG9R2m6L3NjtefFCS17XhANKh6iEm3jVVifMjRvThCuYorEC67HDK3RLVJgwGhGWC5Jbr4Xc7aFTgd7lIftHL/alNcmLmiOpGcle45Uc1sdih1e0r5kkoszUAH+QNBXlN10ayNIP/z8iLv6LgT0qj0RIxvqleAJKawohhPqIPNVeSd+v+Vn7l7zbiYtiiZy03a94nvh1IbXPi6p2QB2uGy1/+3B9eipPiA9yamQh5dx2qP4j30iFUh4kMU2KIPfu2w6es+P5/TCVEebZwD1KqERBlKOCAW4g5EGg4qO2AXKN7as7VBge6KITSUSJogc5GhMgyd0tclON60vLeLpEyVv/C2Sq24WDuS8uy9IFm0vs1pzkCmBxEpFxvOyh20eWkVIpOfVPs27U/l0=
file_glob: true
file: "${TRAVIS_BUILD_DIR}/dist"
+ skip_cleanup: true
on:
repo: Swind/opencv-python
tags: true
From 2955851e6f40b1e6677493e04d11cb1b28e3b9dc Mon Sep 17 00:00:00 2001
From: swind <swind@cloudmosa.com>
Date: Sun, 9 Dec 2018 15:06:54 +0800
Subject: [PATCH 7/8] Change the artifact path
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 096141c0..8a5a89c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -132,7 +132,7 @@ deploy:
api_key:
secure: AtM2g/4gJz2ZR4z6+p9GOkUiBIQGKgpJvkq48CgAeTTjEX0CXxn5XSwat4U8Sxr2QEiWj7giRsZlwW8P5TyPXAZ/R7oy1/hsfHQPpz9PKfrKFRpchgWdqiKfyTJwcTcEgo5VIhWmsnvXhbaQZPRnvAhvZ0b3wHfx/ymbsoyD1oyLJMDWq+K8bPvXni+A+vzv+PsSM4kF+AscjSO3ntVs6lBu7PiXFuz9vmmUY7jDkty3GmPzKA1wav1WNvWklSfiiIZvtGU2wj9iUClhYMibzY9lH4fowG9R2m6L3NjtefFCS17XhANKh6iEm3jVVifMjRvThCuYorEC67HDK3RLVJgwGhGWC5Jbr4Xc7aFTgd7lIftHL/alNcmLmiOpGcle45Uc1sdih1e0r5kkoszUAH+QNBXlN10ayNIP/z8iLv6LgT0qj0RIxvqleAJKawohhPqIPNVeSd+v+Vn7l7zbiYtiiZy03a94nvh1IbXPi6p2QB2uGy1/+3B9eipPiA9yamQh5dx2qP4j30iFUh4kMU2KIPfu2w6es+P5/TCVEebZwD1KqERBlKOCAW4g5EGg4qO2AXKN7as7VBge6KITSUSJogc5GhMgyd0tclON60vLeLpEyVv/C2Sq24WDuS8uy9IFm0vs1pzkCmBxEpFxvOyh20eWkVIpOfVPs27U/l0=
file_glob: true
- file: "${TRAVIS_BUILD_DIR}/dist"
+ file: "${TRAVIS_BUILD_DIR}/wheelhouse"
skip_cleanup: true
on:
repo: Swind/opencv-python
From f2762e4082b13e14af83ae562a1f052b6f611a0a Mon Sep 17 00:00:00 2001
From: swind <swind@cloudmosa.com>
Date: Sun, 9 Dec 2018 15:38:33 +0800
Subject: [PATCH 8/8] Use wildcards to match the artifact file (*.whl)
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 8a5a89c0..08d58d53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -132,7 +132,7 @@ deploy:
api_key:
secure: AtM2g/4gJz2ZR4z6+p9GOkUiBIQGKgpJvkq48CgAeTTjEX0CXxn5XSwat4U8Sxr2QEiWj7giRsZlwW8P5TyPXAZ/R7oy1/hsfHQPpz9PKfrKFRpchgWdqiKfyTJwcTcEgo5VIhWmsnvXhbaQZPRnvAhvZ0b3wHfx/ymbsoyD1oyLJMDWq+K8bPvXni+A+vzv+PsSM4kF+AscjSO3ntVs6lBu7PiXFuz9vmmUY7jDkty3GmPzKA1wav1WNvWklSfiiIZvtGU2wj9iUClhYMibzY9lH4fowG9R2m6L3NjtefFCS17XhANKh6iEm3jVVifMjRvThCuYorEC67HDK3RLVJgwGhGWC5Jbr4Xc7aFTgd7lIftHL/alNcmLmiOpGcle45Uc1sdih1e0r5kkoszUAH+QNBXlN10ayNIP/z8iLv6LgT0qj0RIxvqleAJKawohhPqIPNVeSd+v+Vn7l7zbiYtiiZy03a94nvh1IbXPi6p2QB2uGy1/+3B9eipPiA9yamQh5dx2qP4j30iFUh4kMU2KIPfu2w6es+P5/TCVEebZwD1KqERBlKOCAW4g5EGg4qO2AXKN7as7VBge6KITSUSJogc5GhMgyd0tclON60vLeLpEyVv/C2Sq24WDuS8uy9IFm0vs1pzkCmBxEpFxvOyh20eWkVIpOfVPs27U/l0=
file_glob: true
- file: "${TRAVIS_BUILD_DIR}/wheelhouse"
+ file: "${TRAVIS_BUILD_DIR}/wheelhouse/*.whl"
skip_cleanup: true
on:
repo: Swind/opencv-python