From 8abd4aec6eef988590691c766c40e0d74c5820fc Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@esss.com.br>
Date: Thu, 16 May 2019 08:07:59 -0300
Subject: [PATCH 1/3] Remove customization of (python.exe) from Azure [skip
 travis]

This is no longer needed it seems
---
 azure-pipelines.yml         |  8 ++------
 scripts/upload-coverage.bat | 10 +++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 42be786b5..7b580ffb9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,7 +5,6 @@ trigger:
 variables:
   PYTEST_ADDOPTS: "--junitxml=build/test-results/$(tox.env).xml -vv"
   python.needs_vc: False
-  python.exe: "python"
   COVERAGE_FILE: "$(Build.Repository.LocalPath)/.coverage"
   COVERAGE_PROCESS_START: "$(Build.Repository.LocalPath)/.coveragerc"
   PYTEST_COVERAGE: '0'
@@ -45,12 +44,10 @@ jobs:
       pypy:
         python.version: 'pypy2'
         tox.env: 'pypy'
-        python.exe: 'pypy'
       # NOTE: pypy3 fails to install pip currently due to an internal error.
       # pypy3:
       #   python.version: 'pypy3'
       #   tox.env: 'pypy3'
-      #   python.exe: 'pypy3'
       py34-xdist:
         python.version: '3.4'
         tox.env: 'py34-xdist'
@@ -94,12 +91,12 @@ jobs:
     condition: eq(variables['python.needs_vc'], True)
     displayName: 'Install VC for py27'
 
-  - script: $(python.exe) -m pip install --upgrade pip && $(python.exe) -m pip install tox
+  - script: python -m pip install --upgrade pip && python -m pip install tox
     displayName: 'Install tox'
 
   - script: |
       call scripts/setup-coverage-vars.bat || goto :eof
-      $(python.exe) -m tox -e $(tox.env)
+      python -m tox -e $(tox.env)
     displayName: 'Run tests'
 
   - task: PublishTestResults@2
@@ -112,6 +109,5 @@ jobs:
     displayName: 'Report and upload coverage'
     condition: eq(variables['PYTEST_COVERAGE'], '1')
     env:
-      PYTHON: $(python.exe)
       CODECOV_TOKEN: $(CODECOV_TOKEN)
       PYTEST_CODECOV_NAME: $(tox.env)
diff --git a/scripts/upload-coverage.bat b/scripts/upload-coverage.bat
index b21e0126e..08ed57791 100644
--- a/scripts/upload-coverage.bat
+++ b/scripts/upload-coverage.bat
@@ -6,11 +6,11 @@ if "%PYTEST_COVERAGE%" == "1" (
     ) else (
         echo CODECOV_TOKEN NOT defined
     )
-    %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%
+    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%
 )

From 06fa2bc0b87e78a2947ce6faa6fd3b759239d4aa Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@esss.com.br>
Date: Thu, 16 May 2019 08:10:46 -0300
Subject: [PATCH 2/3] Re-enable pypy3 to see how it fares on Azure

---
 azure-pipelines.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7b580ffb9..de5d27c01 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -44,10 +44,9 @@ jobs:
       pypy:
         python.version: 'pypy2'
         tox.env: 'pypy'
-      # NOTE: pypy3 fails to install pip currently due to an internal error.
-      # pypy3:
-      #   python.version: 'pypy3'
-      #   tox.env: 'pypy3'
+      pypy3:
+        python.version: 'pypy3'
+        tox.env: 'pypy3'
       py34-xdist:
         python.version: '3.4'
         tox.env: 'py34-xdist'

From 56bf7446f6820a2ff392148a53625a5f2fa78921 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@esss.com.br>
Date: Thu, 16 May 2019 12:18:30 -0300
Subject: [PATCH 3/3] Disable pypy2 and pypy3 on Azure [travis skip]

Related to #5279
---
 azure-pipelines.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index de5d27c01..8e50486de 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,12 +41,13 @@ jobs:
         #   Also seen with py27-nobyte (using xdist), and py27-xdist.
         #   But no exception with py27-pexpect,py27-twisted,py27-numpy.
         PYTEST_COVERAGE: '1'
-      pypy:
-        python.version: 'pypy2'
-        tox.env: 'pypy'
-      pypy3:
-        python.version: 'pypy3'
-        tox.env: 'pypy3'
+      # -- pypy2 and pypy3 are disabled for now: #5279 --
+      # pypy:
+      #   python.version: 'pypy2'
+      #   tox.env: 'pypy'
+      # pypy3:
+      #   python.version: 'pypy3'
+      #   tox.env: 'pypy3'
       py34-xdist:
         python.version: '3.4'
         tox.env: 'py34-xdist'