From 113cf734825d89d4b1d633e1443b9a8e901f45bd Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Thu, 15 Aug 2019 13:08:49 +0100
Subject: [PATCH] test with xdist==1.22.0

---
 .travis.yml  | 84 ++++++++++++++++++++++++++++++++++------------------
 appveyor.yml | 11 +++----
 tox.ini      | 10 ++++---
 3 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37a572a9..2d7bbb2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,61 +17,89 @@ jobs:
     - env: TOXENV=docs
 
     - stage: tests
-      env: TOXENV=py27-t310-c45
+      env: TOXENV=py27-t310-c45-xdist22
       python: '2.7'
-    - env: TOXENV=py27-t43-c45
+    - env: TOXENV=py27-t310-c45-xdist27
       python: '2.7'
-    - env: TOXENV=py27-t44-c45
+    - env: TOXENV=py27-t43-c45-xdist22
       python: '2.7'
-    - env: TOXENV=py27-t45-c45
+    - env: TOXENV=py27-t43-c45-xdist27
       python: '2.7'
-    - env: TOXENV=py34-t310-c45
+    - env: TOXENV=py34-t310-c45-xdist22
       python: '3.4'
-    - env: TOXENV=py34-t43-c45
+    - env: TOXENV=py34-t310-c45-xdist27
       python: '3.4'
-    - env: TOXENV=py34-t44-c45
+    - env: TOXENV=py34-t43-c45-xdist22
       python: '3.4'
-    - env: TOXENV=py34-t45-c45
+    - env: TOXENV=py34-t43-c45-xdist27
       python: '3.4'
-    - env: TOXENV=py35-t310-c45
+    - env: TOXENV=py35-t310-c45-xdist22
       python: '3.5'
-    - env: TOXENV=py35-t43-c45
+    - env: TOXENV=py35-t310-c45-xdist27
       python: '3.5'
-    - env: TOXENV=py35-t44-c45
+    - env: TOXENV=py35-t43-c45-xdist22
       python: '3.5'
-    - env: TOXENV=py35-t45-c45
+    - env: TOXENV=py35-t43-c45-xdist27
       python: '3.5'
-    - env: TOXENV=py36-t310-c45
+    - env: TOXENV=py36-t310-c45-xdist22
       python: '3.6'
-    - env: TOXENV=py36-t43-c45
+    - env: TOXENV=py36-t310-c45-xdist27
       python: '3.6'
-    - env: TOXENV=py36-t44-c45
+    - env: TOXENV=py36-t43-c45-xdist22
       python: '3.6'
-    - env: TOXENV=py36-t45-c45
+    - env: TOXENV=py36-t43-c45-xdist27
       python: '3.6'
-    - env: TOXENV=py37-t310-c45
+    - env: TOXENV=py37-t310-c45-xdist22
       python: '3.7'
-    - env: TOXENV=py37-t43-c45
+    - env: TOXENV=py37-t310-c45-xdist27
       python: '3.7'
-    - env: TOXENV=py37-t44-c45
+    - env: TOXENV=py37-t43-c45-xdist22
       python: '3.7'
-    - env: TOXENV=py37-t45-c45
+    - env: TOXENV=py37-t43-c45-xdist27
       python: '3.7'
-    - env: TOXENV=pypy-t310-c45
+    - env: TOXENV=pypy-t310-c45-xdist22
       python: 'pypy2.7-6.0'
-    - env: TOXENV=pypy-t43-c45
+    - env: TOXENV=pypy-t310-c45-xdist27
       python: 'pypy2.7-6.0'
-    - env: TOXENV=pypy-t44-c45
+    - env: TOXENV=pypy-t43-c45-xdist22
       python: 'pypy2.7-6.0'
-    - env: TOXENV=pypy-t45-c45
+    - env: TOXENV=pypy-t43-c45-xdist27
       python: 'pypy2.7-6.0'
-    - env: TOXENV=pypy3-t310-c45
+    - env: TOXENV=pypy3-t310-c45-xdist22
       python: 'pypy3.5-6.0'
-    - env: TOXENV=pypy3-t43-c45
+    - env: TOXENV=pypy3-t310-c45-xdist27
       python: 'pypy3.5-6.0'
-    - env: TOXENV=pypy3-t44-c45
+    - env: TOXENV=pypy3-t43-c45-xdist22
       python: 'pypy3.5-6.0'
-    - env: TOXENV=pypy3-t45-c45
+    - env: TOXENV=pypy3-t43-c45-xdist27
+      python: 'pypy3.5-6.0'
+    - env: TOXENV=py27-t44-c45-xdist28
+      python: '2.7'
+    - env: TOXENV=py27-t45-c45-xdist28
+      python: '2.7'
+    - env: TOXENV=py34-t44-c45-xdist28
+      python: '3.4'
+    - env: TOXENV=py34-t45-c45-xdist28
+      python: '3.4'
+    - env: TOXENV=py35-t44-c45-xdist28
+      python: '3.5'
+    - env: TOXENV=py35-t45-c45-xdist28
+      python: '3.5'
+    - env: TOXENV=py36-t44-c45-xdist28
+      python: '3.6'
+    - env: TOXENV=py36-t45-c45-xdist28
+      python: '3.6'
+    - env: TOXENV=py37-t44-c45-xdist28
+      python: '3.7'
+    - env: TOXENV=py37-t45-c45-xdist28
+      python: '3.7'
+    - env: TOXENV=pypy-t44-c45-xdist28
+      python: 'pypy2.7-6.0'
+    - env: TOXENV=pypy-t45-c45-xdist28
+      python: 'pypy2.7-6.0'
+    - env: TOXENV=pypy3-t44-c45-xdist28
+      python: 'pypy3.5-6.0'
+    - env: TOXENV=pypy3-t45-c45-xdist28
       python: 'pypy3.5-6.0'
 
     - stage: examples
diff --git a/appveyor.yml b/appveyor.yml
index 836eaf5a..9e141425 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,10 +6,10 @@ cache:
 environment:
   matrix:
     - TOXENV: check
-    - TOXENV: 'py27-t310-c45,py27-t43-c45,py27-t44-c45,py27-t45-c45'
-    - TOXENV: 'py34-t310-c45,py34-t43-c45,py34-t44-c45,py34-t45-c45'
-    - TOXENV: 'py35-t310-c45,py35-t43-c45,py35-t44-c45,py35-t45-c45'
-    - TOXENV: 'pypy-t310-c45,pypy-t43-c45,pypy-t44-c45,pypy-t45-c45'
+    - TOXENV: 'py27-t310-c45-xdist22,py27-t310-c45-xdist27,py27-t43-c45-xdist22,py27-t43-c45-xdist27,py27-t44-c45-xdist28,py27-t45-c45-xdist28'
+    - TOXENV: 'py34-t310-c45-xdist22,py34-t310-c45-xdist27,py34-t43-c45-xdist22,py34-t43-c45-xdist27,py34-t44-c45-xdist28,py34-t45-c45-xdist28'
+    - TOXENV: 'py35-t310-c45-xdist22,py35-t310-c45-xdist27,py35-t43-c45-xdist22,py35-t43-c45-xdist27,py35-t44-c45-xdist28,py35-t45-c45-xdist28'
+    - TOXENV: 'pypy-t310-c45-xdist22,pypy-t310-c45-xdist27,pypy-t43-c45-xdist22,pypy-t43-c45-xdist27,pypy-t44-c45-xdist28,pypy-t45-c45-xdist28'
 
 init:
   - ps: echo $env:TOXENV
@@ -23,9 +23,6 @@ install:
   - echo PyPy installed
   - pypy --version
 
-  # Upgrade virtualenv for e.g. more-itertools to be handled properly.
-  # Pin it to work around https://github.com/tox-dev/tox/issues/1389.
-  - C:\Python35\python -m pip install -U virtualenv==16.5.0
   - C:\Python35\python -m pip install tox
 
 test_script:
diff --git a/tox.ini b/tox.ini
index c5a6f93f..c31bc7d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
-; a generative tox configuration, see: https://testrun.org/tox/latest/config.html#generative-envlist
+; a generative tox configuration, see: https://tox.readthedocs.io/en/latest/config.html#generating-environments-conditional-settings
 
 [tox]
 envlist =
     check
-    {py27,py34,py35,py36,py37,pypy,pypy3}-{t310,t43,t44,t45}-{c45}
+    {py27,py34,py35,py36,py37,pypy,pypy3}-{t310,t43}-{c45}-xdist{22,27}
+    {py27,py34,py35,py36,py37,pypy,pypy3}-{t44,t45}-{c45}-xdist28
     docs
 
 [testenv]
@@ -19,8 +20,9 @@ setenv =
     t44:  _DEP_PYTEST=pytest==4.4.2
     t45:  _DEP_PYTEST=pytest==4.5.0
 
-    {t310,t40,t41,t43}: _DEP_PYTESTXDIST=pytest-xdist==1.27.0
-    {t44,t45}: _DEP_PYTESTXDIST=pytest-xdist==1.28.0
+    xdist22: _DEP_PYTESTXDIST=pytest-xdist==1.22.0
+    xdist27: _DEP_PYTESTXDIST=pytest-xdist==1.27.0
+    xdist28: _DEP_PYTESTXDIST=pytest-xdist==1.28.0
 
     c44: _DEP_COVERAGE=coverage==4.4.2
     c45: _DEP_COVERAGE=coverage==4.5.3