Skip to content

Commit

Permalink
update appveyor config
Browse files Browse the repository at this point in the history
  • Loading branch information
harvimt committed Nov 20, 2017
1 parent 9c0c66b commit 370f86c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 36 deletions.
48 changes: 21 additions & 27 deletions 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%"

Expand Down
12 changes: 3 additions & 9 deletions appveyor/install.ps1
Expand Up @@ -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 () {
Expand All @@ -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
}
}
}
Expand Down

0 comments on commit 370f86c

Please sign in to comment.