From c2337ae5c1c9bd86046f04bc1c080c069d8b6597 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Fri, 6 Dec 2019 18:23:16 +0900 Subject: [PATCH 1/4] use forked opencv and update other modules --- .gitmodules | 2 +- multibuild | 2 +- opencv | 2 +- opencv_contrib | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index f2e0d283..5938fa98 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "opencv"] path = opencv - url = https://github.com/opencv/opencv.git + url = https://github.com/mbdevpl/opencv.git [submodule "opencv_contrib"] path = opencv_contrib url = https://github.com/opencv/opencv_contrib.git diff --git a/multibuild b/multibuild index 68a4af04..88a0b6f0 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 68a4af043e2adb0d9353d4a0e1f3d871203237aa +Subproject commit 88a0b6f0eb770cf9f95792d66410e7696ce3d384 diff --git a/opencv b/opencv index 4c71dbf0..5b6a237f 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 4c71dbf0af70e8728b8a791695b083540af72887 +Subproject commit 5b6a237f1a79201bf4cd994689b2751fdb3bfa68 diff --git a/opencv_contrib b/opencv_contrib index 83e98d24..7011e1b1 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit 83e98d2424bbe3854d4686dc6c9cf9a15812e8d7 +Subproject commit 7011e1b1cb29af35d0bd526b0060f9d592c40133 From 1a920504b38370284931dcd45c3f961dda94fe0d Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 9 Dec 2019 13:12:02 +0900 Subject: [PATCH 2/4] removed builds for Python < 3.6 --- .travis.yml | 252 ---------------------------------------------------- 1 file changed, 252 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b9b33c9..a9711803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,22 +64,6 @@ matrix: #further jobs in the list will use the same stage until the next assignment - stage: final os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=2.7 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=0 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.5 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=0 - workspaces: - use: brew_cache - - os: osx osx_image: xcode8.3 env: - MB_PYTHON_VERSION=3.6 @@ -107,22 +91,6 @@ matrix: use: brew_cache # headless builds for MacOS - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=2.7 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=1 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.5 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=1 - workspaces: - use: brew_cache - os: osx osx_image: xcode8.3 env: @@ -151,22 +119,6 @@ matrix: use: brew_cache # Contrib builds for MacOS - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=2.7 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=0 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.5 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=0 - workspaces: - use: brew_cache - os: osx osx_image: xcode8.3 env: @@ -195,22 +147,6 @@ matrix: use: brew_cache # headless contrib builds for MacOS - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=2.7 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=1 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.5 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=1 - workspaces: - use: brew_cache - os: osx osx_image: xcode8.3 env: @@ -239,53 +175,6 @@ matrix: use: brew_cache # 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.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 @@ -339,53 +228,6 @@ matrix: 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.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 @@ -439,53 +281,6 @@ matrix: 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.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 @@ -540,53 +335,6 @@ matrix: # 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.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 From dd70f972054d8e65cfff658f1eb47ad7a57e5059 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Tue, 10 Dec 2019 15:31:11 +0900 Subject: [PATCH 3/4] skip most builds --- .travis.yml | 428 ++++++++++++++++++++++++++-------------------------- 1 file changed, 214 insertions(+), 214 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9711803..8c53be10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,62 +64,62 @@ matrix: #further jobs in the list will use the same stage until the next assignment - stage: final os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.6 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=0 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.7 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=0 - - TEST_DEPENDS=numpy==1.14.5 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.8 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=0 - - TEST_DEPENDS=numpy==1.17.3 - workspaces: - use: brew_cache - - # headless builds for MacOS - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.6 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=1 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.7 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=1 - - TEST_DEPENDS=numpy==1.14.5 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.8 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=1 - - TEST_DEPENDS=numpy==1.17.3 - workspaces: - use: brew_cache - - # Contrib builds for MacOS - - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.6 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=0 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.7 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=0 + # - TEST_DEPENDS=numpy==1.14.5 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.8 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=0 + # - TEST_DEPENDS=numpy==1.17.3 + # workspaces: + # use: brew_cache + # + # # headless builds for MacOS + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.6 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=1 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.7 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=1 + # - TEST_DEPENDS=numpy==1.14.5 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.8 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=1 + # - TEST_DEPENDS=numpy==1.17.3 + # workspaces: + # use: brew_cache + # + # # Contrib builds for MacOS + # - os: osx osx_image: xcode8.3 env: - MB_PYTHON_VERSION=3.6 @@ -175,110 +175,110 @@ matrix: use: brew_cache # default builds for Linux - - 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 - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=0 - - TEST_DEPENDS=numpy==1.17.3 - cache: - directories: $HOME/.ccache - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - PLAT=i686 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=0 - - TEST_DEPENDS=numpy==1.17.3 - cache: - directories: $HOME/.ccache - - # headless builds for Linux - - 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 - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=1 - - TEST_DEPENDS=numpy==1.17.3 - cache: - directories: $HOME/.ccache - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - PLAT=i686 - - ENABLE_CONTRIB=0 - - ENABLE_HEADLESS=1 - - TEST_DEPENDS=numpy==1.17.3 - 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 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.8 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=0 + # - TEST_DEPENDS=numpy==1.17.3 + # cache: + # directories: $HOME/.ccache + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.8 + # - PLAT=i686 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=0 + # - TEST_DEPENDS=numpy==1.17.3 + # cache: + # directories: $HOME/.ccache + # + # # headless builds for Linux + # - 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 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.8 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=1 + # - TEST_DEPENDS=numpy==1.17.3 + # cache: + # directories: $HOME/.ccache + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.8 + # - PLAT=i686 + # - ENABLE_CONTRIB=0 + # - ENABLE_HEADLESS=1 + # - TEST_DEPENDS=numpy==1.17.3 + # cache: + # directories: $HOME/.ccache # contrib builds for Linux - os: linux @@ -289,15 +289,15 @@ matrix: - 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.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 @@ -306,15 +306,15 @@ matrix: - 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 + # - 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 - os: linux env: - MB_PYTHON_VERSION=3.8 @@ -323,15 +323,15 @@ matrix: - ENABLE_HEADLESS=0 cache: directories: $HOME/.ccache - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - PLAT=i686 - - TEST_DEPENDS=numpy==1.17.3 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=0 - cache: - directories: $HOME/.ccache + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.8 + # - PLAT=i686 + # - TEST_DEPENDS=numpy==1.17.3 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=0 + # cache: + # directories: $HOME/.ccache # headless contrib builds for Linux @@ -343,32 +343,32 @@ matrix: - 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.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 - - PLAT=i686 - 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 - os: linux env: - MB_PYTHON_VERSION=3.8 @@ -377,15 +377,15 @@ matrix: - ENABLE_HEADLESS=1 cache: directories: $HOME/.ccache - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - PLAT=i686 - - TEST_DEPENDS=numpy==1.17.3 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=1 - cache: - directories: $HOME/.ccache + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.8 + # - PLAT=i686 + # - TEST_DEPENDS=numpy==1.17.3 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=1 + # cache: + # directories: $HOME/.ccache # The first line is printed in the folding header in Travis output before_install: | From 74ac00c6fccaa716188778da5fa6dcb24a9c9f79 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Tue, 10 Dec 2019 16:12:32 +0900 Subject: [PATCH 4/4] disable all mac builds --- .travis.yml | 114 ++++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c53be10..9bbd08a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,8 +62,8 @@ matrix: # default builds for MacOS #further jobs in the list will use the same stage until the next assignment - - stage: final - os: osx + # - stage: final + # os: osx # osx_image: xcode8.3 # env: # - MB_PYTHON_VERSION=3.6 @@ -120,59 +120,59 @@ matrix: # # # Contrib builds for MacOS # - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.6 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=0 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.7 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=0 - - TEST_DEPENDS=numpy==1.14.5 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.8 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=0 - - TEST_DEPENDS=numpy==1.17.3 - workspaces: - use: brew_cache - - # headless contrib builds for MacOS - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.6 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=1 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.7 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=1 - - TEST_DEPENDS=numpy==1.14.5 - workspaces: - use: brew_cache - - os: osx - osx_image: xcode8.3 - env: - - MB_PYTHON_VERSION=3.8 - - ENABLE_CONTRIB=1 - - ENABLE_HEADLESS=1 - - TEST_DEPENDS=numpy==1.17.3 - workspaces: - use: brew_cache + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.6 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=0 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.7 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=0 + # - TEST_DEPENDS=numpy==1.14.5 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.8 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=0 + # - TEST_DEPENDS=numpy==1.17.3 + # workspaces: + # use: brew_cache + # + # # headless contrib builds for MacOS + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.6 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=1 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.7 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=1 + # - TEST_DEPENDS=numpy==1.14.5 + # workspaces: + # use: brew_cache + # - os: osx + # osx_image: xcode8.3 + # env: + # - MB_PYTHON_VERSION=3.8 + # - ENABLE_CONTRIB=1 + # - ENABLE_HEADLESS=1 + # - TEST_DEPENDS=numpy==1.17.3 + # workspaces: + # use: brew_cache # default builds for Linux # - os: linux @@ -281,7 +281,9 @@ matrix: # directories: $HOME/.ccache # contrib builds for Linux - - os: linux + - stage: final + os: linux + # - os: linux env: - MB_PYTHON_VERSION=3.6 - TEST_DEPENDS=numpy==1.11.3