Merge branch 'python_3.8_appveyor'

Legrandin · Oct 29, 2019 · f22d31b · f22d31b
2 parents 5b4e8d8 + dc1920a
commit f22d31b
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 43 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,46 +7,54 @@ environment:
     WITH_COMPILER: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
 
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.8"
+    #- PYTHON: "C:\\Python27"
+    #  PYTHON_VERSION: "2.7.8"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python34"
+    #  PYTHON_VERSION: "3.4.1"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python27-x64"
+    #  PYTHON_VERSION: "2.7.8"
+    #  PYTHON_ARCH: "64"
+    #  WINDOWS_SDK_VERSION: "v7.0"
+
+    #- PYTHON: "C:\\Python34-x64"
+    #  PYTHON_VERSION: "3.4.1"
+    #  PYTHON_ARCH: "64"
+    #  WINDOWS_SDK_VERSION: "v7.1"
+
+    #- PYTHON: "C:\\Python35"
+    #  PYTHON_VERSION: "3.5.0"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python35-x64"
+    #  PYTHON_VERSION: "3.5.0"
+    #  PYTHON_ARCH: "64"
+
+    #- PYTHON: "C:\\Python36"
+    #  PYTHON_VERSION: "3.6.0"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python36-x64"
+    #  PYTHON_VERSION: "3.6.0"
+    #  PYTHON_ARCH: "64"
+
+    #- PYTHON: "C:\\Python37"
+    #  PYTHON_VERSION: "3.7.0"
+    #  PYTHON_ARCH: "32"
+
+    #- PYTHON: "C:\\Python37-x64"
+    #  PYTHON_VERSION: "3.7.0"
+    #  PYTHON_ARCH: "64"
+
+    - PYTHON: "C:\\Python38"
+      PYTHON_VERSION: "3.8.0"
       PYTHON_ARCH: "32"
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.1"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.8"
-      PYTHON_ARCH: "64"
-      WINDOWS_SDK_VERSION: "v7.0"
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.1"
-      PYTHON_ARCH: "64"
-      WINDOWS_SDK_VERSION: "v7.1"
-
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.0"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.0"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6.0"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.0"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python37"
-      PYTHON_VERSION: "3.7.0"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python37-x64"
-      PYTHON_VERSION: "3.7.0"
+    - PYTHON: "C:\\Python38-x64"
+      PYTHON_VERSION: "3.8.0"
       PYTHON_ARCH: "64"
 
 init:

diff --git a/appveyor/install.ps1 b/appveyor/install.ps1
@@ -8,7 +8,7 @@ $GET_PIP_PATH = "C:\get-pip.py"
 
 function DownloadPython ($python_version, $platform_suffix) {
     $webclient = New-Object System.Net.WebClient
-    $filename = "python-" + $python_version + $platform_suffix + ".msi"
+    $filename = "python-" + $python_version + $platform_suffix + ".exe"
     $url = $BASE_URL + $python_version + "/" + $filename
 
     $basedir = $pwd.Path + "\"
@@ -27,6 +27,7 @@ function DownloadPython ($python_version, $platform_suffix) {
             break
         }
         Catch [Exception]{
+            Write-Host $_.Exception.ToString()
             Start-Sleep 1
         }
    }
@@ -44,13 +45,16 @@ function InstallPython ($python_version, $architecture, $python_home) {
     if ($architecture -eq "32") {
         $platform_suffix = ""
     } else {
-        $platform_suffix = ".amd64"
+        $platform_suffix = "-amd64"
     }
     $filepath = DownloadPython $python_version $platform_suffix
     Write-Host "Installing" $filepath "to" $python_home
-    $args = "/qn /i $filepath TARGETDIR=$python_home"
-    Write-Host "msiexec.exe" $args
-    Start-Process -FilePath "msiexec.exe" -ArgumentList $args -Wait -Passthru
+    #$args = "/qn /i $filepath TARGETDIR=$python_home"
+    #Write-Host "msiexec.exe" $args
+    #Start-Process -FilePath "msiexec.exe" -ArgumentList $args -Wait -Passthru
+    $args = "/quiet InstallAllUsers=1 PrependPath=1 Include_test=0 TargetDir=$python_home"
+    Write-Host $filepath $args
+    Start-Process -FilePath $filepath -ArgumentList $args -Wait -Passthru
     Write-Host "Python $python_version ($architecture) installation complete"
     return $true
 }