Commit 96f94f81 authored by Jason Madden's avatar Jason Madden

Nope, that was too new. Try another way to unbreak installing pip

parent a0f6e7de
...@@ -20,7 +20,7 @@ env: ...@@ -20,7 +20,7 @@ env:
- PYTHONDONTWRITEBYTECODE=1 - PYTHONDONTWRITEBYTECODE=1
- PIP_UPGRADE_STRATEGY=eager - PIP_UPGRADE_STRATEGY=eager
# Don't get warnings about Python 2 support being deprecated. We # Don't get warnings about Python 2 support being deprecated. We
# know. # know. The env var works for pip 20.
- PIP_NO_PYTHON_VERSION_WARNING=1 - PIP_NO_PYTHON_VERSION_WARNING=1
- CC="ccache gcc" - CC="ccache gcc"
- CCACHE_NOCPP2=true - CCACHE_NOCPP2=true
......
...@@ -141,8 +141,6 @@ install: ...@@ -141,8 +141,6 @@ install:
(New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-win32.zip', "${env:PYTMP}\pypy2-v7.3.0-win32.zip"); (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-win32.zip', "${env:PYTMP}\pypy2-v7.3.0-win32.zip");
} }
7z x -y "${env:PYTMP}\pypy2-v7.3.0-win32.zip" -oC:\ | Out-Null; 7z x -y "${env:PYTMP}\pypy2-v7.3.0-win32.zip" -oC:\ | Out-Null;
& "${env:PYTHON}\pypy.exe" "-mensurepip";
} }
elseif (-not(Test-Path($env:PYTHON))) { elseif (-not(Test-Path($env:PYTHON))) {
& appveyor\install.ps1; & appveyor\install.ps1;
...@@ -159,8 +157,10 @@ install: ...@@ -159,8 +157,10 @@ install:
- "%PYEXE% -c \"import struct; print(struct.calcsize('P') * 8)\"" - "%PYEXE% -c \"import struct; print(struct.calcsize('P') * 8)\""
# Upgrade to the latest version of pip to avoid it displaying warnings # Upgrade to the latest version of pip to avoid it displaying warnings
# about it being out of date. # about it being out of date. Do this here instead of above in
- "%CMD_IN_ENV% %PYEXE% -m pip install --disable-pip-version-check --user --upgrade pip" # powershell because the annoying 'DEPRECATION:blahblahblah 2.7 blahblahblah'
# breaks powershell.
- "%CMD_IN_ENV% %PYEXE% -mensurepip -U --user"
- ps: "if(Test-Path(\"${env:PYTHON}\\bin\")) {ls ${env:PYTHON}\\bin;}" - ps: "if(Test-Path(\"${env:PYTHON}\\bin\")) {ls ${env:PYTHON}\\bin;}"
- ps: "if(Test-Path(\"${env:PYTHON}\\Scripts\")) {ls ${env:PYTHON}\\Scripts;}" - ps: "if(Test-Path(\"${env:PYTHON}\\Scripts\")) {ls ${env:PYTHON}\\Scripts;}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment