Skip to content

Commit b273599

Browse files
committed
fix testing pypy
1 parent 3af9f16 commit b273599

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

winbuild/test_docker.ps1

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
param ([string]$python)
22
$ErrorActionPreference = 'Stop'
33
$ProgressPreference = 'SilentlyContinue'
4+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
45
if ($python -like "pypy*") {
5-
$url = 'https://downloads.python.org/pypy/{0}-v7.3.11-win64.zip' -f $python
6-
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
6+
echo "Downloading https://aka.ms/vs/15/release/vc_redist.x64.exe"
77
Invoke-WebRequest -Uri 'https://aka.ms/vs/15/release/vc_redist.x64.exe' -OutFile 'vc_redist.x64.exe'
8-
& C:\vc_redist.x64.exe /install /quiet /norestart
8+
C:\vc_redist.x64.exe /install /quiet /norestart | Out-Null
9+
$url = 'https://downloads.python.org/pypy/{0}-v7.3.13-win64.zip' -f $python
10+
echo "Downloading $url"
911
Invoke-WebRequest -Uri $url -OutFile 'pypy.zip'
1012
tar -xf 'pypy.zip'
1113
mv pypy*-win64 C:\Python
1214
} else {
1315
$url = 'https://www.python.org/ftp/python/{0}.0/python-{0}.0-amd64.exe' -f $python
14-
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
16+
echo "Downloading $url"
1517
Invoke-WebRequest -Uri $url -OutFile 'setup.exe'
1618
Start-Process setup.exe -Wait -NoNewWindow -PassThru -ArgumentList @(
1719
'/quiet',
@@ -29,6 +31,7 @@ $env:path += ";C:\Python\;C:\pillow\winbuild\build\bin\"
2931
cd C:\pillow
3032
& python -VV
3133
& python -m ensurepip
34+
& python -m pip install -U pip
3235
& python -m pip install pytest pytest-timeout
3336
& python -m pip install "$(Get-ChildItem *.whl -Name)"
3437
& python -m pytest -vx Tests\check_wheel.py Tests

0 commit comments

Comments
 (0)