diff --git a/.appveyor.yml b/.appveyor.yml index 6e8d8052..b5c6654e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,8 +6,8 @@ environment: - TOXENV: check - TOXENV: 'py27-pytest46-xdist27-coverage45,py27-pytest46-xdist27-coverage52' - TOXENV: 'py35-pytest46-xdist27-coverage45,py35-pytest46-xdist27-coverage52' - - TOXENV: 'py36-pytest46-xdist27-coverage45,py36-pytest46-xdist27-coverage52,py36-pytest46-xdist33-coverage45,py36-pytest46-xdist33-coverage52,py36-pytest54-xdist33-coverage45,py36-pytest54-xdist33-coverage52,py36-pytest60-xdistd34-coverage52' - - TOXENV: 'py37-pytest46-xdist27-coverage45,py37-pytest46-xdist27-coverage52,py37-pytest46-xdist33-coverage45,py37-pytest46-xdist33-coverage52,py37-pytest54-xdist33-coverage45,py37-pytest54-xdist33-coverage52,py37-pytest60-xdistd34-coverage52' + - TOXENV: 'py36-pytest46-xdist27-coverage45,py36-pytest46-xdist27-coverage52,py36-pytest46-xdist33-coverage45,py36-pytest46-xdist33-coverage52,py36-pytest54-xdist33-coverage45,py36-pytest54-xdist33-coverage52,py36-pytest60-xdist200-coverage52' + - TOXENV: 'py37-pytest46-xdist27-coverage45,py37-pytest46-xdist27-coverage52,py37-pytest46-xdist33-coverage45,py37-pytest46-xdist33-coverage52,py37-pytest54-xdist33-coverage45,py37-pytest54-xdist33-coverage52,py37-pytest60-xdist200-coverage52' - TOXENV: 'pypy-pytest46-xdist27-coverage45,pypy-pytest46-xdist27-coverage52' init: diff --git a/.travis.yml b/.travis.yml index 1a27246b..3c96aad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,13 +76,13 @@ jobs: python: 'pypy3' - env: TOXENV=pypy3-pytest54-xdist33-coverage52 python: 'pypy3' - - env: TOXENV=py36-pytest60-xdistd34-coverage52 + - env: TOXENV=py36-pytest60-xdist200-coverage52 python: '3.6' - - env: TOXENV=py37-pytest60-xdistd34-coverage52 + - env: TOXENV=py37-pytest60-xdist200-coverage52 python: '3.7' - - env: TOXENV=py38-pytest60-xdistd34-coverage52 + - env: TOXENV=py38-pytest60-xdist200-coverage52 python: '3.8' - - env: TOXENV=pypy3-pytest60-xdistd34-coverage52 + - env: TOXENV=pypy3-pytest60-xdist200-coverage52 python: 'pypy3' - stage: examples diff --git a/tox.ini b/tox.ini index 935db17d..ec088198 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = check py{27,35,36,37,py,py3}-pytest46-xdist27-coverage{45,52} py{36,37,38,py3}-pytest{46,54}-xdist33-coverage{45,52} - py{36,37,38,py3}-pytest{60}-xdistd34-coverage{52} + py{36,37,38,py3}-pytest{60}-xdist200-coverage{52} docs [testenv] @@ -25,6 +25,7 @@ setenv = xdist32: _DEP_PYTESTXDIST=pytest-xdist==1.32.0 xdist33: _DEP_PYTESTXDIST=pytest-xdist==1.33.0 xdist34: _DEP_PYTESTXDIST=pytest-xdist==1.34.0 + xdist200: _DEP_PYTESTXDIST=pytest-xdist==2.0.0 xdistdev: _DEP_PYTESTXDIST=git+https://github.com/pytest-dev/pytest-xdist.git#egg=pytest-xdist coverage45: _DEP_COVERAGE=coverage==4.5.4