Unify pypy (#5209)

Unify pypy
This commit is contained in:
Bruno Oliveira 2019-05-04 10:46:14 -03:00 committed by GitHub
commit e1a426c067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 20 deletions

View File

@ -43,10 +43,10 @@ jobs:
# But no exception with py27-pexpect,py27-twisted,py27-numpy. # But no exception with py27-pexpect,py27-twisted,py27-numpy.
PYTEST_COVERAGE: '1' PYTEST_COVERAGE: '1'
pypy: pypy:
python.version: 'pypy' python.version: 'pypy2'
tox.env: 'pypy' tox.env: 'pypy'
python.exe: 'pypy' python.exe: 'pypy'
# NOTE: pypy3 fails to install pip currently due to an interal error. # NOTE: pypy3 fails to install pip currently due to an internal error.
# pypy3: # pypy3:
# python.version: 'pypy3' # python.version: 'pypy3'
# tox.env: 'pypy3' # tox.env: 'pypy3'
@ -86,7 +86,6 @@ jobs:
steps: steps:
- task: UsePythonVersion@0 - task: UsePythonVersion@0
condition: not(startsWith(variables['python.exe'], 'pypy'))
inputs: inputs:
versionSpec: '$(python.version)' versionSpec: '$(python.version)'
architecture: 'x64' architecture: 'x64'
@ -95,23 +94,6 @@ jobs:
condition: eq(variables['python.needs_vc'], True) condition: eq(variables['python.needs_vc'], True)
displayName: 'Install VC for py27' displayName: 'Install VC for py27'
- script: choco install python.pypy
condition: eq(variables['python.exe'], 'pypy')
displayName: 'Install pypy'
- script: choco install pypy3
condition: eq(variables['python.exe'], 'pypy3')
displayName: 'Install pypy3'
- task: PowerShell@2
inputs:
targetType: 'inline'
script: |
Invoke-WebRequest -Uri "https://bootstrap.pypa.io/get-pip.py" -OutFile "get-pip.py"
$(python.exe) get-pip.py
condition: startsWith(variables['python.exe'], 'pypy')
displayName: 'Install pip'
- script: $(python.exe) -m pip install --upgrade pip && $(python.exe) -m pip install tox - script: $(python.exe) -m pip install --upgrade pip && $(python.exe) -m pip install tox
displayName: 'Install tox' displayName: 'Install tox'