diff --git a/appveyor.yml b/appveyor.yml index 090c7d8d..da53ec11 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,55 +6,6 @@ environment: secure: HHNjmjxQSvgSY9Zde0qh6A== matrix: - - PYTHON: "C:/Python27" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "2.7" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 0 - - - PYTHON: "C:/Python27-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "2.7" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 0 - - - PYTHON: "C:/Python34" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "3.4" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 0 - - - PYTHON: "C:/Python34-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "3.4" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 0 - - - PYTHON: "C:/Python35" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "3.5" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 0 - - - PYTHON: "C:/Python35-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "3.5" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 0 - - - PYTHON: "C:/Python36" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "3.6" - NP_VERSION: "1.11.3" - ENABLE_CONTRIB: 0 - - PYTHON: "C:/Python36-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" @@ -62,62 +13,6 @@ environment: NP_VERSION: "1.11.3" ENABLE_CONTRIB: 0 - - PYTHON: "C:/Python27" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "2.7" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 1 - - - PYTHON: "C:/Python27-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "2.7" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 1 - - - PYTHON: "C:/Python34" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "3.4" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 1 - - - PYTHON: "C:/Python34-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "3.4" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 1 - - - PYTHON: "C:/Python35" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "3.5" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 1 - - - PYTHON: "C:/Python35-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "3.5" - NP_VERSION: "1.11.1" - ENABLE_CONTRIB: 1 - - - PYTHON: "C:/Python36" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "3.6" - NP_VERSION: "1.11.3" - ENABLE_CONTRIB: 1 - - - PYTHON: "C:/Python36-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "3.6" - NP_VERSION: "1.11.3" - ENABLE_CONTRIB: 1 - install: - cmd: >- diff --git a/opencv b/opencv index 4af3ca4e..2ac57a2b 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 4af3ca4e4d7be246a49d751a79c6392e848ac2aa +Subproject commit 2ac57a2b1fc0b49ddd07f3e3633461fcab5fc3f0