From ab6f4523e70923b03c9a81da3d5ca436d8480826 Mon Sep 17 00:00:00 2001 From: BJ Quinn Date: Wed, 6 Sep 2017 14:36:50 -0500 Subject: [PATCH 1/2] OpenCV updated to master --- opencv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencv b/opencv index 4af3ca4e..2ac57a2b 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 4af3ca4e4d7be246a49d751a79c6392e848ac2aa +Subproject commit 2ac57a2b1fc0b49ddd07f3e3633461fcab5fc3f0 From ccba2c6ad23e1ffdcb8a5b0114733e4a1983237e Mon Sep 17 00:00:00 2001 From: BJ Quinn Date: Wed, 6 Sep 2017 14:53:13 -0500 Subject: [PATCH 2/2] Edited appveyor.yml to only do Python 3.6 64 bit without contrib --- appveyor.yml | 105 --------------------------------------------------- 1 file changed, 105 deletions(-) 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: >-