Update test deps.

pytest-dev · Jan 11, 2021 · 4ce7ac3 · 4ce7ac3
1 parent 0eada98
commit 4ce7ac3
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 54 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,11 +4,11 @@ build: off
 environment:
   matrix:
     - 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-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'
+    - TOXENV: 'py27-pytest46-xdist127-coverage52,py27-pytest46-xdist127-coverage53'
+    - TOXENV: 'py35-pytest46-xdist127-coverage52,py35-pytest46-xdist127-coverage53'
+    - TOXENV: 'py36-pytest46-xdist127-coverage52,py36-pytest46-xdist127-coverage53,py36-pytest46-xdist133-coverage53,py36-pytest54-xdist133-coverage53,py36-pytest62-xdist202-coverage53'
+    - TOXENV: 'py37-pytest46-xdist127-coverage52,py37-pytest46-xdist127-coverage53,py37-pytest46-xdist133-coverage53,py37-pytest54-xdist133-coverage53,py37-pytest62-xdist202-coverage53'
+    - TOXENV: 'pypy-pytest46-xdist127-coverage52,pypy-pytest46-xdist127-coverage53'
 
 init:
   - ps: echo $env:TOXENV

diff --git a/.travis.yml b/.travis.yml
@@ -20,69 +20,55 @@ jobs:
     - env: TOXENV=docs
 
     - stage: tests
-      env: TOXENV=py27-pytest46-xdist27-coverage45
+      env: TOXENV=py27-pytest46-xdist127-coverage52
       python: '2.7'
-    - env: TOXENV=py27-pytest46-xdist27-coverage52
+    - env: TOXENV=py27-pytest46-xdist127-coverage53
       python: '2.7'
-    - env: TOXENV=py35-pytest46-xdist27-coverage45
+    - env: TOXENV=py35-pytest46-xdist127-coverage52
       python: '3.5'
-    - env: TOXENV=py35-pytest46-xdist27-coverage52
+    - env: TOXENV=py35-pytest46-xdist127-coverage53
       python: '3.5'
-    - env: TOXENV=py36-pytest46-xdist27-coverage45
+    - env: TOXENV=py36-pytest46-xdist127-coverage52
       python: '3.6'
-    - env: TOXENV=py36-pytest46-xdist27-coverage52
+    - env: TOXENV=py36-pytest46-xdist127-coverage53
       python: '3.6'
-    - env: TOXENV=py37-pytest46-xdist27-coverage45
+    - env: TOXENV=py37-pytest46-xdist127-coverage52
       python: '3.7'
-    - env: TOXENV=py37-pytest46-xdist27-coverage52
+    - env: TOXENV=py37-pytest46-xdist127-coverage53
       python: '3.7'
-    - env: TOXENV=pypy-pytest46-xdist27-coverage45
+    - env: TOXENV=pypy-pytest46-xdist127-coverage52
       python: 'pypy'
-    - env: TOXENV=pypy-pytest46-xdist27-coverage52
+    - env: TOXENV=pypy-pytest46-xdist127-coverage53
       python: 'pypy'
-    - env: TOXENV=pypy3-pytest46-xdist27-coverage45
+    - env: TOXENV=pypy3-pytest46-xdist127-coverage52
       python: 'pypy3'
-    - env: TOXENV=pypy3-pytest46-xdist27-coverage52
+    - env: TOXENV=pypy3-pytest46-xdist127-coverage53
       python: 'pypy3'
-    - env: TOXENV=py36-pytest46-xdist33-coverage45
+    - env: TOXENV=py36-pytest46-xdist133-coverage53
       python: '3.6'
-    - env: TOXENV=py36-pytest46-xdist33-coverage52
+    - env: TOXENV=py36-pytest54-xdist133-coverage53
       python: '3.6'
-    - env: TOXENV=py36-pytest54-xdist33-coverage45
-      python: '3.6'
-    - env: TOXENV=py36-pytest54-xdist33-coverage52
-      python: '3.6'
-    - env: TOXENV=py37-pytest46-xdist33-coverage45
-      python: '3.7'
-    - env: TOXENV=py37-pytest46-xdist33-coverage52
-      python: '3.7'
-    - env: TOXENV=py37-pytest54-xdist33-coverage45
+    - env: TOXENV=py37-pytest46-xdist133-coverage53
       python: '3.7'
-    - env: TOXENV=py37-pytest54-xdist33-coverage52
+    - env: TOXENV=py37-pytest54-xdist133-coverage53
       python: '3.7'
-    - env: TOXENV=py38-pytest46-xdist33-coverage45
+    - env: TOXENV=py38-pytest46-xdist133-coverage53
       python: '3.8'
-    - env: TOXENV=py38-pytest46-xdist33-coverage52
+    - env: TOXENV=py38-pytest54-xdist133-coverage53
       python: '3.8'
-    - env: TOXENV=py38-pytest54-xdist33-coverage45
-      python: '3.8'
-    - env: TOXENV=py38-pytest54-xdist33-coverage52
-      python: '3.8'
-    - env: TOXENV=pypy3-pytest46-xdist33-coverage45
-      python: 'pypy3'
-    - env: TOXENV=pypy3-pytest46-xdist33-coverage52
-      python: 'pypy3'
-    - env: TOXENV=pypy3-pytest54-xdist33-coverage45
+    - env: TOXENV=pypy3-pytest46-xdist133-coverage53
       python: 'pypy3'
-    - env: TOXENV=pypy3-pytest54-xdist33-coverage52
+    - env: TOXENV=pypy3-pytest54-xdist133-coverage53
       python: 'pypy3'
-    - env: TOXENV=py36-pytest60-xdist200-coverage52
+    - env: TOXENV=py36-pytest62-xdist202-coverage53
       python: '3.6'
-    - env: TOXENV=py37-pytest60-xdist200-coverage52
+    - env: TOXENV=py37-pytest62-xdist202-coverage53
       python: '3.7'
-    - env: TOXENV=py38-pytest60-xdist200-coverage52
+    - env: TOXENV=py38-pytest62-xdist202-coverage53
       python: '3.8'
-    - env: TOXENV=pypy3-pytest60-xdist200-coverage52
+    - env: TOXENV=py39-pytest62-xdist202-coverage53
+      python: '3.9'
+    - env: TOXENV=pypy3-pytest62-xdist202-coverage53
       python: 'pypy3'
 
     - stage: examples

diff --git a/tox.ini b/tox.ini
@@ -13,9 +13,9 @@ passenv =
 [tox]
 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}-xdist200-coverage{52}
+    py{27,35,36,37,py,py3}-pytest46-xdist127-coverage{52,53}
+    py{36,37,38,py3}-pytest{46,54}-xdist133-coverage{53}
+    py{36,37,38,39,py3}-pytest{62}-xdist202-coverage{53}
     docs
 
 [testenv]
@@ -27,21 +27,26 @@ setenv =
     pytest46:  _DEP_PYTEST=pytest==4.6.10
     pytest53:  _DEP_PYTEST=pytest==5.3.2
     pytest54:  _DEP_PYTEST=pytest==5.4.3
-    pytest60:  _DEP_PYTEST=pytest==6.0.1
+    pytest60:  _DEP_PYTEST=pytest==6.0.2
+    pytest61:  _DEP_PYTEST=pytest==6.1.2
+    pytest62:  _DEP_PYTEST=pytest==6.2.1
 
     xdist27: _DEP_PYTESTXDIST=pytest-xdist==1.27.0
-    xdist29: _DEP_PYTESTXDIST=pytest-xdist==1.29.0
-    xdist31: _DEP_PYTESTXDIST=pytest-xdist==1.31.0
-    xdist32: _DEP_PYTESTXDIST=pytest-xdist==1.32.0
-    xdist33: _DEP_PYTESTXDIST=pytest-xdist==1.33.0
-    xdist34: _DEP_PYTESTXDIST=pytest-xdist==1.34.0
+    xdist129: _DEP_PYTESTXDIST=pytest-xdist==1.29.0
+    xdist131: _DEP_PYTESTXDIST=pytest-xdist==1.31.0
+    xdist132: _DEP_PYTESTXDIST=pytest-xdist==1.32.0
+    xdist133: _DEP_PYTESTXDIST=pytest-xdist==1.33.0
+    xdist134: _DEP_PYTESTXDIST=pytest-xdist==1.34.0
     xdist200: _DEP_PYTESTXDIST=pytest-xdist==2.0.0
+    xdist201: _DEP_PYTESTXDIST=pytest-xdist==2.1.0
+    xdist202: _DEP_PYTESTXDIST=pytest-xdist==2.2.0
     xdistdev: _DEP_PYTESTXDIST=git+https://github.com/pytest-dev/pytest-xdist.git#egg=pytest-xdist
 
     coverage45: _DEP_COVERAGE=coverage==4.5.4
     coverage50: _DEP_COVERAGE=coverage==5.0.4
     coverage51: _DEP_COVERAGE=coverage==5.1
     coverage52: _DEP_COVERAGE=coverage==5.2.1
+    coverage53: _DEP_COVERAGE=coverage==5.3.1
     # For testing against a coverage.py working tree.
     coveragedev: _DEP_COVERAGE=-e{env:COVERAGE_HOME}
 passenv =