Try to get appveryor to use 3.5rc2

2 files changed, 18 insertions, 15 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 45e74f6..6d86411 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,8 +5,12 @@ version: '{branch}-{build}'
 
 build: off
 
+shallow_clone: true
+
 environment:
 
+  PYTHON_PRERELEASE: ""
+
   global:
     WITH_COMPILER: "cmd /E:ON /V:ON /C .\\ci\\appveyor-with-compiler.cmd"
 
@@ -17,13 +21,6 @@ environment:
       PYTHON_VERSION: "2.6.6"
       PYTHON_ARCH: "32"
 
-#    - TOXENV: "py26"
-#      TOXPYTHON: "C:\\Python26\\python.exe"
-#      WINDOWS_SDK_VERSION: "v7.0"
-#      PYTHON_HOME: "C:\\Python26"
-#      PYTHON_VERSION: "2.6"
-#      PYTHON_ARCH: "32"
-#
     - TOXENV: "py27"
       WINDOWS_SDK_VERSION: "v7.0"
       PYTHON_HOME: "C:\\Python27"
@@ -42,6 +39,13 @@ environment:
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "32"
 
+    - TOXENV: "py35"
+      WINDOWS_SDK_VERSION: "v7.1"
+      PYTHON_HOME: "C:\\Python35"
+      PYTHON_VERSION: "3.5"
+      PYTHON_PRERELEASE: "rc2"
+      PYTHON_ARCH: "32"
+
     # Meta coverage
     - TOXENV: "py27"
       WINDOWS_SDK_VERSION: "v7.0"
@@ -59,7 +63,6 @@ environment:
 
 init:
   - "ECHO %TOXENV%"
-  - ps: "ls C:\\Python*"
 
 install:
   - "powershell ci\\appveyor-bootstrap.ps1"
diff --git a/ci/appveyor-bootstrap.ps1 b/ci/appveyor-bootstrap.ps1
index 1dd5342..04aad9b 100644
--- a/ci/appveyor-bootstrap.ps1
+++ b/ci/appveyor-bootstrap.ps1
@@ -8,9 +8,9 @@ $GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
 $GET_PIP_PATH = "C:\get-pip.py"
 
 
-function DownloadPython ($python_version, $platform_suffix) {
+function DownloadPython ($python_version, $prerelease, $platform_suffix) {
     $webclient = New-Object System.Net.WebClient
-    $filename = "python-" + $python_version + $platform_suffix + ".msi"
+    $filename = "python-" + $python_version + $prerelease + $platform_suffix + ".msi"
     $url = $BASE_URL + $python_version + "/" + $filename
 
     $basedir = $pwd.Path + "\"
@@ -23,12 +23,12 @@ function DownloadPython ($python_version, $platform_suffix) {
     # Download and retry up to 5 times in case of network transient errors.
     Write-Host "Downloading" $filename "from" $url
     $retry_attempts = 3
-    for($i=0; $i -lt $retry_attempts; $i++){
+    for ($i=0; $i -lt $retry_attempts; $i++) {
         try {
             $webclient.DownloadFile($url, $filepath)
             break
         }
-        Catch [Exception]{
+        Catch [Exception] {
             Start-Sleep 1
         }
    }
@@ -37,7 +37,7 @@ function DownloadPython ($python_version, $platform_suffix) {
 }
 
 
-function InstallPython ($python_version, $architecture, $python_home) {
+function InstallPython ($python_version, $prerelease, $architecture, $python_home) {
     Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
     if (Test-Path $python_home) {
         Write-Host $python_home "already exists, skipping."
@@ -48,7 +48,7 @@ function InstallPython ($python_version, $architecture, $python_home) {
     } else {
         $platform_suffix = ".amd64"
     }
-    $filepath = DownloadPython $python_version $platform_suffix
+    $filepath = DownloadPython $python_version $prerelease $platform_suffix
     Write-Host "Installing" $filepath "to" $python_home
     $args = "/qn /i $filepath TARGETDIR=$python_home"
     Write-Host "msiexec.exe" $args
@@ -78,7 +78,7 @@ function InstallPackage ($python_home, $pkg) {
 }
 
 function main () {
-    InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON_HOME
+    InstallPython $env:PYTHON_VERSION $env:PYTHON_PRERELEASE $env:PYTHON_ARCH $env:PYTHON_HOME
     InstallPip $env:PYTHON_HOME
     InstallPackage $env:PYTHON_HOME setuptools
     InstallPackage $env:PYTHON_HOME wheel