Skip to content

Commit 4ce7ac3

Browse files
ionelmcionelmc
committed
Update test deps.
1 parent 0eada98 commit 4ce7ac3

File tree

3 files changed

+45
-54
lines changed

3 files changed

+45
-54
lines changed

‎.appveyor.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ build: off
44
environment:
55
matrix:
66
- TOXENV: check
7-
- TOXENV: 'py27-pytest46-xdist27-coverage45,py27-pytest46-xdist27-coverage52'
8-
- TOXENV: 'py35-pytest46-xdist27-coverage45,py35-pytest46-xdist27-coverage52'
9-
- 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'
10-
- 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'
11-
- TOXENV: 'pypy-pytest46-xdist27-coverage45,pypy-pytest46-xdist27-coverage52'
7+
- TOXENV: 'py27-pytest46-xdist127-coverage52,py27-pytest46-xdist127-coverage53'
8+
- TOXENV: 'py35-pytest46-xdist127-coverage52,py35-pytest46-xdist127-coverage53'
9+
- TOXENV: 'py36-pytest46-xdist127-coverage52,py36-pytest46-xdist127-coverage53,py36-pytest46-xdist133-coverage53,py36-pytest54-xdist133-coverage53,py36-pytest62-xdist202-coverage53'
10+
- TOXENV: 'py37-pytest46-xdist127-coverage52,py37-pytest46-xdist127-coverage53,py37-pytest46-xdist133-coverage53,py37-pytest54-xdist133-coverage53,py37-pytest62-xdist202-coverage53'
11+
- TOXENV: 'pypy-pytest46-xdist127-coverage52,pypy-pytest46-xdist127-coverage53'
1212

1313
init:
1414
- ps: echo $env:TOXENV

‎.travis.yml‎

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,69 +20,55 @@ jobs:
2020
- env: TOXENV=docs
2121

2222
- stage: tests
23-
env: TOXENV=py27-pytest46-xdist27-coverage45
23+
env: TOXENV=py27-pytest46-xdist127-coverage52
2424
python: '2.7'
25-
- env: TOXENV=py27-pytest46-xdist27-coverage52
25+
- env: TOXENV=py27-pytest46-xdist127-coverage53
2626
python: '2.7'
27-
- env: TOXENV=py35-pytest46-xdist27-coverage45
27+
- env: TOXENV=py35-pytest46-xdist127-coverage52
2828
python: '3.5'
29-
- env: TOXENV=py35-pytest46-xdist27-coverage52
29+
- env: TOXENV=py35-pytest46-xdist127-coverage53
3030
python: '3.5'
31-
- env: TOXENV=py36-pytest46-xdist27-coverage45
31+
- env: TOXENV=py36-pytest46-xdist127-coverage52
3232
python: '3.6'
33-
- env: TOXENV=py36-pytest46-xdist27-coverage52
33+
- env: TOXENV=py36-pytest46-xdist127-coverage53
3434
python: '3.6'
35-
- env: TOXENV=py37-pytest46-xdist27-coverage45
35+
- env: TOXENV=py37-pytest46-xdist127-coverage52
3636
python: '3.7'
37-
- env: TOXENV=py37-pytest46-xdist27-coverage52
37+
- env: TOXENV=py37-pytest46-xdist127-coverage53
3838
python: '3.7'
39-
- env: TOXENV=pypy-pytest46-xdist27-coverage45
39+
- env: TOXENV=pypy-pytest46-xdist127-coverage52
4040
python: 'pypy'
41-
- env: TOXENV=pypy-pytest46-xdist27-coverage52
41+
- env: TOXENV=pypy-pytest46-xdist127-coverage53
4242
python: 'pypy'
43-
- env: TOXENV=pypy3-pytest46-xdist27-coverage45
43+
- env: TOXENV=pypy3-pytest46-xdist127-coverage52
4444
python: 'pypy3'
45-
- env: TOXENV=pypy3-pytest46-xdist27-coverage52
45+
- env: TOXENV=pypy3-pytest46-xdist127-coverage53
4646
python: 'pypy3'
47-
- env: TOXENV=py36-pytest46-xdist33-coverage45
47+
- env: TOXENV=py36-pytest46-xdist133-coverage53
4848
python: '3.6'
49-
- env: TOXENV=py36-pytest46-xdist33-coverage52
49+
- env: TOXENV=py36-pytest54-xdist133-coverage53
5050
python: '3.6'
51-
- env: TOXENV=py36-pytest54-xdist33-coverage45
52-
python: '3.6'
53-
- env: TOXENV=py36-pytest54-xdist33-coverage52
54-
python: '3.6'
55-
- env: TOXENV=py37-pytest46-xdist33-coverage45
56-
python: '3.7'
57-
- env: TOXENV=py37-pytest46-xdist33-coverage52
58-
python: '3.7'
59-
- env: TOXENV=py37-pytest54-xdist33-coverage45
51+
- env: TOXENV=py37-pytest46-xdist133-coverage53
6052
python: '3.7'
61-
- env: TOXENV=py37-pytest54-xdist33-coverage52
53+
- env: TOXENV=py37-pytest54-xdist133-coverage53
6254
python: '3.7'
63-
- env: TOXENV=py38-pytest46-xdist33-coverage45
55+
- env: TOXENV=py38-pytest46-xdist133-coverage53
6456
python: '3.8'
65-
- env: TOXENV=py38-pytest46-xdist33-coverage52
57+
- env: TOXENV=py38-pytest54-xdist133-coverage53
6658
python: '3.8'
67-
- env: TOXENV=py38-pytest54-xdist33-coverage45
68-
python: '3.8'
69-
- env: TOXENV=py38-pytest54-xdist33-coverage52
70-
python: '3.8'
71-
- env: TOXENV=pypy3-pytest46-xdist33-coverage45
72-
python: 'pypy3'
73-
- env: TOXENV=pypy3-pytest46-xdist33-coverage52
74-
python: 'pypy3'
75-
- env: TOXENV=pypy3-pytest54-xdist33-coverage45
59+
- env: TOXENV=pypy3-pytest46-xdist133-coverage53
7660
python: 'pypy3'
77-
- env: TOXENV=pypy3-pytest54-xdist33-coverage52
61+
- env: TOXENV=pypy3-pytest54-xdist133-coverage53
7862
python: 'pypy3'
79-
- env: TOXENV=py36-pytest60-xdist200-coverage52
63+
- env: TOXENV=py36-pytest62-xdist202-coverage53
8064
python: '3.6'
81-
- env: TOXENV=py37-pytest60-xdist200-coverage52
65+
- env: TOXENV=py37-pytest62-xdist202-coverage53
8266
python: '3.7'
83-
- env: TOXENV=py38-pytest60-xdist200-coverage52
67+
- env: TOXENV=py38-pytest62-xdist202-coverage53
8468
python: '3.8'
85-
- env: TOXENV=pypy3-pytest60-xdist200-coverage52
69+
- env: TOXENV=py39-pytest62-xdist202-coverage53
70+
python: '3.9'
71+
- env: TOXENV=pypy3-pytest62-xdist202-coverage53
8672
python: 'pypy3'
8773

8874
- stage: examples

‎tox.ini‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ passenv =
1313
[tox]
1414
envlist =
1515
check
16-
py{27,35,36,37,py,py3}-pytest46-xdist27-coverage{45,52}
17-
py{36,37,38,py3}-pytest{46,54}-xdist33-coverage{45,52}
18-
py{36,37,38,py3}-pytest{60}-xdist200-coverage{52}
16+
py{27,35,36,37,py,py3}-pytest46-xdist127-coverage{52,53}
17+
py{36,37,38,py3}-pytest{46,54}-xdist133-coverage{53}
18+
py{36,37,38,39,py3}-pytest{62}-xdist202-coverage{53}
1919
docs
2020

2121
[testenv]
@@ -27,21 +27,26 @@ setenv =
2727
pytest46: _DEP_PYTEST=pytest==4.6.10
2828
pytest53: _DEP_PYTEST=pytest==5.3.2
2929
pytest54: _DEP_PYTEST=pytest==5.4.3
30-
pytest60: _DEP_PYTEST=pytest==6.0.1
30+
pytest60: _DEP_PYTEST=pytest==6.0.2
31+
pytest61: _DEP_PYTEST=pytest==6.1.2
32+
pytest62: _DEP_PYTEST=pytest==6.2.1
3133

3234
xdist27: _DEP_PYTESTXDIST=pytest-xdist==1.27.0
33-
xdist29: _DEP_PYTESTXDIST=pytest-xdist==1.29.0
34-
xdist31: _DEP_PYTESTXDIST=pytest-xdist==1.31.0
35-
xdist32: _DEP_PYTESTXDIST=pytest-xdist==1.32.0
36-
xdist33: _DEP_PYTESTXDIST=pytest-xdist==1.33.0
37-
xdist34: _DEP_PYTESTXDIST=pytest-xdist==1.34.0
35+
xdist129: _DEP_PYTESTXDIST=pytest-xdist==1.29.0
36+
xdist131: _DEP_PYTESTXDIST=pytest-xdist==1.31.0
37+
xdist132: _DEP_PYTESTXDIST=pytest-xdist==1.32.0
38+
xdist133: _DEP_PYTESTXDIST=pytest-xdist==1.33.0
39+
xdist134: _DEP_PYTESTXDIST=pytest-xdist==1.34.0
3840
xdist200: _DEP_PYTESTXDIST=pytest-xdist==2.0.0
41+
xdist201: _DEP_PYTESTXDIST=pytest-xdist==2.1.0
42+
xdist202: _DEP_PYTESTXDIST=pytest-xdist==2.2.0
3943
xdistdev: _DEP_PYTESTXDIST=git+https://github.com/pytest-dev/pytest-xdist.git#egg=pytest-xdist
4044

4145
coverage45: _DEP_COVERAGE=coverage==4.5.4
4246
coverage50: _DEP_COVERAGE=coverage==5.0.4
4347
coverage51: _DEP_COVERAGE=coverage==5.1
4448
coverage52: _DEP_COVERAGE=coverage==5.2.1
49+
coverage53: _DEP_COVERAGE=coverage==5.3.1
4550
# For testing against a coverage.py working tree.
4651
coveragedev: _DEP_COVERAGE=-e{env:COVERAGE_HOME}
4752
passenv =

0 commit comments

Comments
 (0)