Merge pull request #4874 from blueyed/pypy3-azure

ci: azure: fix coverage reporting with PyPy (not used currently)

azure-pipelines.yml

@@ -37,6 +37,10 @@ jobs:
         python.version: 'pypy'
         tox.env: 'pypy'
         python.exe: 'pypy'
+      pypy3:
+        python.version: 'pypy3'
+        tox.env: 'pypy3'
+        python.exe: 'pypy3'
       py34:
         python.version: '3.4'
         tox.env: 'py34'
@@ -112,8 +116,9 @@ jobs:
     condition: succeededOrFailed()
 
   - script: call scripts\upload-coverage.bat
-    displayName: 'Upload coverage'
+    displayName: 'Report and upload coverage'
     condition: eq(variables['PYTEST_COVERAGE'], '1')
     env:
+      PYTHON: $(python.exe)
       CODECOV_TOKEN: $(CODECOV_TOKEN)
       PYTEST_CODECOV_NAME: $(tox.env)

scripts/upload-coverage.bat

@@ -6,11 +6,11 @@ if "%PYTEST_COVERAGE%" == "1" (
     ) else (
         echo CODECOV_TOKEN NOT defined
     )
-    python -m pip install codecov
-    coverage combine
-    coverage xml
-    coverage report -m
-    scripts\retry codecov --required -X gcov pycov search -f coverage.xml --name %PYTEST_CODECOV_NAME%
+    %PYTHON% -m pip install codecov
+    %PYTHON% -m coverage combine
+    %PYTHON% -m coverage xml
+    %PYTHON% -m coverage report -m
+    scripts\retry %PYTHON% -m codecov --required -X gcov pycov search -f coverage.xml --name %PYTEST_CODECOV_NAME%
 ) else (
     echo Skipping coverage upload, PYTEST_COVERAGE=%PYTEST_COVERAGE%
 )