From 32b85e4cccaf2981837063a316021e48ab73e958 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 26 Feb 2019 12:57:27 +0100
Subject: [PATCH 1/3] ci: Travis: use xdist with pluggymaster jobs

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ba2ba37f2..9ec72187f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,10 @@ env:
     # Specialized factors for py27.
     - TOXENV=py27-nobyte
     - TOXENV=py27-xdist
-    - TOXENV=py27-pluggymaster
+    - TOXENV=py27-pluggymaster-xdist
     # Specialized factors for py37.
     - TOXENV=py37-pexpect,py37-trial,py37-numpy
-    - TOXENV=py37-pluggymaster
+    - TOXENV=py37-pluggymaster-xdist
     - TOXENV=py37-freeze PYTEST_NO_COVERAGE=1
 
 matrix:

From f85f36ed038618350409941fa5c38aa93d99b3b1 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 13 Feb 2019 18:35:38 +0100
Subject: [PATCH 2/3] AppVeyor: drop pluggymaster

---
 appveyor.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 773e16b1b..da4def8f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,14 +6,13 @@ environment:
   - TOXENV: "py34-xdist"
   - TOXENV: "py35-xdist"
   - TOXENV: "py36-xdist"
+  # NOTE: pypy-xdist is buggy currently (https://github.com/pytest-dev/pytest-xdist/issues/142).
   - TOXENV: "pypy"
     PYTEST_NO_COVERAGE: "1"
   # Specialized factors for py27.
   - TOXENV: "py27-trial,py27-numpy,py27-nobyte"
-  - TOXENV: "py27-pluggymaster"
   # Specialized factors for py37.
   - TOXENV: "py37-trial,py37-numpy"
-  - TOXENV: "py37-pluggymaster"
   - TOXENV: "py37-freeze"
     PYTEST_NO_COVERAGE: "1"
 

From 4eb40ef283b6177f02cffc68b4fc9b332d4a6a34 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 26 Feb 2019 14:03:15 +0100
Subject: [PATCH 3/3] ci: azure: use xdist with pluggymaster

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9f375bbc9..049980efb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,9 +27,9 @@ jobs:
         python.version: '2.7'
         tox.env: 'py27-trial'
         python.needs_vc: True
-      py27-pluggymaster:
+      py27-pluggymaster-xdist:
         python.version: '2.7'
-        tox.env: 'pluggymaster'
+        tox.env: 'py27-pluggymaster-xdist'
       pypy:
         python.version: 'pypy'
         tox.env: 'pypy'
@@ -55,9 +55,9 @@ jobs:
       py37-trial/numpy:
         python.version: '3.7'
         tox.env: 'py37-trial,py37-numpy'
-      py37-pluggymaster:
+      py37-pluggymaster-xdist:
         python.version: '3.7'
-        tox.env: 'py37-pluggymaster'
+        tox.env: 'py37-pluggymaster-xdist'
     maxParallel: 10
 
   steps: