diff --git a/.travis.yml b/.travis.yml index 6aed49c8ca59764c99d9c8005f6199851edc7880..fc6c526a2a53a988a43ad1dd2ebda0b5e24b2fae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,13 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 + - os: osx + language: generic + osx_image: xcode7.3 + env: + - MB_PYTHON_VERSION=3.7 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=0 # headless builds for MacOS - os: osx @@ -86,6 +93,13 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=1 + - os: osx + language: generic + osx_image: xcode7.3 + env: + - MB_PYTHON_VERSION=3.7 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 # Contrib builds for MacOS - os: osx @@ -116,6 +130,13 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=0 + - os: osx + language: generic + osx_image: xcode7.3 + env: + - MB_PYTHON_VERSION=3.7 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 # headless contrib builds for MacOS - os: osx @@ -146,6 +167,13 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=1 + - os: osx + language: generic + osx_image: xcode7.3 + env: + - MB_PYTHON_VERSION=3.7 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 # default builds for Linux - os: linux @@ -207,6 +235,13 @@ matrix: - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 - TEST_DEPENDS=numpy==1.11.3 + - os: linux + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=i686 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.14.5 # headless builds for Linux - os: linux @@ -268,6 +303,13 @@ matrix: - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=1 - TEST_DEPENDS=numpy==1.11.3 + - os: linux + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=i686 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.14.5 # contrib builds for Linux - os: linux @@ -329,6 +371,14 @@ matrix: - TEST_DEPENDS=numpy==1.11.3 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=0 + - os: linux + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=i686 + - TEST_DEPENDS=numpy==1.14.5 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + # headless contrib builds for Linux - os: linux @@ -390,6 +440,13 @@ matrix: - TEST_DEPENDS=numpy==1.11.3 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=1 + - os: linux + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=i686 + - TEST_DEPENDS=numpy==1.14.5 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 # The first line is printed in the folding header in Travis output before_install: | diff --git a/appveyor.yml b/appveyor.yml index c7a8b3195eb3cc81ee0a9b5ef515c84254c1dbf9..53a3938ef99aa0c1354253c387741e25fb817e67 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,6 +38,14 @@ environment: ENABLE_CONTRIB: 0 ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python37" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 0 + + - PYTHON: "C:/Python37-x64" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python27" ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 0 @@ -70,6 +78,14 @@ environment: ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python37" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 0 + + - PYTHON: "C:/Python37-x64" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python27" ENABLE_CONTRIB: 0 ENABLE_HEADLESS: 1 @@ -102,6 +118,14 @@ environment: ENABLE_CONTRIB: 0 ENABLE_HEADLESS: 1 + - PYTHON: "C:/Python37" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 1 + + - PYTHON: "C:/Python37-x64" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 1 + - PYTHON: "C:/Python27" ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 1 @@ -134,6 +158,14 @@ environment: ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 1 + - PYTHON: "C:/Python37" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 1 + + - PYTHON: "C:/Python37-x64" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 1 + matrix: fast_finish: true diff --git a/multibuild b/multibuild index ae3e559829d34a74c706baa9389a101e52d8e2d0..afbff539ea815f3dafcd68f1bf1e87c4381bcbda 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit ae3e559829d34a74c706baa9389a101e52d8e2d0 +Subproject commit afbff539ea815f3dafcd68f1bf1e87c4381bcbda diff --git a/opencv b/opencv index 6ffc48769ac60d53c4bd1913eac15117c9b1c9f7..9e1b1e5389237c2b9f6c7b9d7715d9836c0a5de1 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 6ffc48769ac60d53c4bd1913eac15117c9b1c9f7 +Subproject commit 9e1b1e5389237c2b9f6c7b9d7715d9836c0a5de1 diff --git a/opencv_contrib b/opencv_contrib index ced5aa760688dd2ec867ebf7bd4f0c2341d2fde5..d4e02869454998c9af5af1a5c3392cdc0c31dd22 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit ced5aa760688dd2ec867ebf7bd4f0c2341d2fde5 +Subproject commit d4e02869454998c9af5af1a5c3392cdc0c31dd22 diff --git a/setup.py b/setup.py index 6874e29080cb6cf471e2fb5e692f8ae89374e61f..aadc307ea62869a8cf9666f63f7fd9df3c898239 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,14 @@ def main(): # Only import 3rd-party modules after having installed all the build dependencies: # any of them, or their dependencies, can be updated during that process, # leading to version conflicts - numpy_version = get_or_install("numpy", "1.11.3" if sys.version_info[:2] >= (3, 6) else "1.11.1") + minimum_supported_numpy = "1.11.1" + + if sys.version_info[:2] >= (3, 6): + minimum_supported_numpy = "1.11.3" + if sys.version_info[:2] >= (3, 7): + minimum_supported_numpy = "1.14.5" + + numpy_version = get_or_install("numpy", minimum_supported_numpy) get_or_install("scikit-build") import skbuild