From 370f86c47a4722396becf999808323e27bb047ef Mon Sep 17 00:00:00 2001
From: Mark Thomas West Harviston <mark.harviston@gmail.com>
Date: Mon, 20 Nov 2017 00:34:42 -0800
Subject: [PATCH] update appveyor config

---
 appveyor.yml         | 48 +++++++++++++++++++-------------------------
 appveyor/install.ps1 | 12 +++--------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c7405b0..0093bac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,46 +1,40 @@
 environment:
 
   matrix:
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.3"
-      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "64"
       QTIMPL: "PySide"
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.3"
-      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "64"
       QTIMPL: "PyQt4"
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.3"
-      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "64"
       QTIMPL: "PyQt5"
+   
+    - PYTHON: "C:\\Python35-x64"
+      PYTHON_VERSION: "3.5.x"
+      PYTHON_ARCH: "64"
+      QTIMPL: "PyQt4"
 
-    - PYTHON: "C:\\Python33"
-      PYTHON_VERSION: "3.3.5"
-      PYTHON_ARCH: "32"
-      QTIMPL: "PySide"
-    
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.3"
-      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6.x"
+      PYTHON_ARCH: "64"
       QTIMPL: "PyQt4"
 
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.3"
-      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6.x"
+      PYTHON_ARCH: "64"
       QTIMPL: "PyQt5"
-      
-    - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6.1"
-      PYTHON_ARCH: "32"
-      QTIMPL: "PyQt4"
 
     - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6.1"
+      PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "32"
       QTIMPL: "PyQt5"
-
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH% %QTIMPL%"
 
diff --git a/appveyor/install.ps1 b/appveyor/install.ps1
index 84fa63a..282be19 100644
--- a/appveyor/install.ps1
+++ b/appveyor/install.ps1
@@ -22,7 +22,7 @@ function InstallPip ($python_home) {
 
 function InstallPackage ($python_home, $pkg) {
 	$pip_path = $python_home + "\Scripts\pip.exe"
-	& $pip_path install $pkg
+	& $pip_path install --only-binary=PySide --only-binary=PyQt4 --only-binary=PyQt5 --find-links .\wheelhouse $pkg
 }
 
 function main () {
@@ -31,21 +31,15 @@ function main () {
 	InstallPip $env:PYTHON
 	InstallPackage $env:PYTHON wheel
 	InstallPackage $env:PYTHON pytest
-	InstallPackage $env:PYTHON pytest-timeout
-	if($PYTHON_MAJ_VERSION -eq '3.3'){
-		InstallPackage $env:PYTHON asyncio
-	}
 	switch ($env:QTIMPL){
 		"PySide" {
 			InstallPackage $env:Python PySide
 		}
 		"PyQt4" {
-			(new-object net.webclient).DownloadFile("http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.4/PyQt4-4.11.4-gpl-Py3.4-Qt4.8.7-x32.exe/download", "C:\install-PyQt4.exe")
-			Start-Process -FilePath C:\install-PyQt4.exe -ArgumentList "/S" -Wait -Passthru
+			InstallPackage $env:Python PyQt4
 		}
 		"PyQt5" {
-			(new-object net.webclient).DownloadFile("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/PyQt5-5.5.1-gpl-Py3.4-Qt5.5.1-x32.exe/download", "C:\install-PyQt5.exe")
-			Start-Process -FilePath C:\install-PyQt5.exe -ArgumentList "/S" -Wait -Passthru
+			InstallPackage $env:Python PyQt5
 		}
 	}
 }