summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Behnel <stefan_ml@behnel.de>2021-04-14 20:18:00 +0200
committerStefan Behnel <stefan_ml@behnel.de>2021-04-14 20:18:00 +0200
commit1f087a63463ffca38d174c5fad349606cdad2a1e (patch)
tree6f37aeb86aba64c480687ca3adbed7933a9d0d0b
parenta6ab2a9a542eb1bb005112c7ec381bdec8aea74a (diff)
parent7a4e43da9f2f42591eaff90d2e8b15bf809e4308 (diff)
downloadcython-1f087a63463ffca38d174c5fad349606cdad2a1e.tar.gz
Merge branch '0.29.x'
-rw-r--r--appveyor/install.ps111
1 files changed, 7 insertions, 4 deletions
diff --git a/appveyor/install.ps1 b/appveyor/install.ps1
index 6a8fc6ad9..6dc32f40a 100644
--- a/appveyor/install.ps1
+++ b/appveyor/install.ps1
@@ -48,12 +48,14 @@ function InstallPython ($python_version, $architecture, $python_home) {
$installer_exe = ($py_major + $py_minor) -as [int] -ge 35
if ($installer_exe) {
$arch_suffix = @{"32"="";"64"="-amd64"}[$architecture]
- $filename = "python-" + $python_version + $arch_suffix + ".exe"
+ $dl_filename = "python-" + $python_version + $arch_suffix + ".exe"
+ $filename = "python-" + $py_major + "." + $py_minor + $arch_suffix + ".exe"
} else {
$arch_suffix = @{"32"="";"64"=".amd64"}[$architecture]
- $filename = "python-" + $python_version + $arch_suffix + ".msi"
+ $dl_filename = "python-" + $python_version + $arch_suffix + ".msi"
+ $filename = "python-" + $py_major + "." + $py_minor + $arch_suffix + ".msi"
}
- $url = $PYTHON_BASE_URL + $python_version + "/" + $filename
+ $url = $PYTHON_BASE_URL + $python_version + "/" + $dl_filename
$filepath = Download $url $filename $DOWNLOADS
Write-Host "Installing" $filename "to" $python_home
if ($installer_exe) {
@@ -99,7 +101,8 @@ function InstallPipPackage ($python_home, $package) {
}
function main () {
- InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
+ $full_version = $env:PYTHON_VERSION + ".0"
+ InstallPython $full_version $env:PYTHON_ARCH $env:PYTHON
InstallPip $env:PYTHON
InstallPipPackage $env:PYTHON setuptools
InstallPipPackage $env:PYTHON wheel