Skip to content

Commit c2dfa77

Browse files
committed
Update test deps. Remove unnecessary assertion. Closes #452.
1 parent 5e1913e commit c2dfa77

File tree

4 files changed

+30
-51
lines changed

4 files changed

+30
-51
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-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'
7+
- TOXENV: 'py27-pytest46-xdist127-coverage55'
8+
- TOXENV: 'py35-pytest46-xdist127-coverage55'
9+
- TOXENV: 'py36-pytest46-xdist127-coverage55,py36-pytest46-xdist133-coverage55,py36-pytest54-xdist133-coverage55,py36-pytest62-xdist202-coverage55'
10+
- TOXENV: 'py37-pytest46-xdist127-coverage55,py37-pytest46-xdist133-coverage55,py37-pytest54-xdist133-coverage55,py37-pytest62-xdist202-coverage55'
11+
- TOXENV: 'pypy-pytest46-xdist127-coverage55'
1212

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

.travis.yml

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

2222
- stage: tests
23-
env: TOXENV=py27-pytest46-xdist127-coverage52
23+
env: TOXENV=py27-pytest46-xdist127-coverage55
2424
python: '2.7'
25-
- env: TOXENV=py27-pytest46-xdist127-coverage53
26-
python: '2.7'
27-
- env: TOXENV=py35-pytest46-xdist127-coverage52
28-
python: '3.5'
29-
- env: TOXENV=py35-pytest46-xdist127-coverage53
25+
- env: TOXENV=py35-pytest46-xdist127-coverage55
3026
python: '3.5'
31-
- env: TOXENV=py36-pytest46-xdist127-coverage52
32-
python: '3.6'
33-
- env: TOXENV=py36-pytest46-xdist127-coverage53
27+
- env: TOXENV=py36-pytest46-xdist127-coverage55
3428
python: '3.6'
35-
- env: TOXENV=py37-pytest46-xdist127-coverage52
29+
- env: TOXENV=py37-pytest46-xdist127-coverage55
3630
python: '3.7'
37-
- env: TOXENV=py37-pytest46-xdist127-coverage53
38-
python: '3.7'
39-
- env: TOXENV=pypy-pytest46-xdist127-coverage52
40-
python: 'pypy'
41-
- env: TOXENV=pypy-pytest46-xdist127-coverage53
31+
- env: TOXENV=pypy-pytest46-xdist127-coverage55
4232
python: 'pypy'
43-
- env: TOXENV=pypy3-pytest46-xdist127-coverage52
44-
python: 'pypy3'
45-
- env: TOXENV=pypy3-pytest46-xdist127-coverage53
33+
- env: TOXENV=pypy3-pytest46-xdist127-coverage55
4634
python: 'pypy3'
47-
- env: TOXENV=py36-pytest46-xdist133-coverage53
35+
- env: TOXENV=py36-pytest46-xdist133-coverage55
4836
python: '3.6'
49-
- env: TOXENV=py36-pytest54-xdist133-coverage53
37+
- env: TOXENV=py36-pytest54-xdist133-coverage55
5038
python: '3.6'
51-
- env: TOXENV=py37-pytest46-xdist133-coverage53
39+
- env: TOXENV=py37-pytest46-xdist133-coverage55
5240
python: '3.7'
53-
- env: TOXENV=py37-pytest54-xdist133-coverage53
41+
- env: TOXENV=py37-pytest54-xdist133-coverage55
5442
python: '3.7'
55-
- env: TOXENV=py38-pytest46-xdist133-coverage53
43+
- env: TOXENV=py38-pytest46-xdist133-coverage55
5644
python: '3.8'
57-
- env: TOXENV=py38-pytest54-xdist133-coverage53
45+
- env: TOXENV=py38-pytest54-xdist133-coverage55
5846
python: '3.8'
59-
- env: TOXENV=pypy3-pytest46-xdist133-coverage53
47+
- env: TOXENV=pypy3-pytest46-xdist133-coverage55
6048
python: 'pypy3'
61-
- env: TOXENV=pypy3-pytest54-xdist133-coverage53
49+
- env: TOXENV=pypy3-pytest54-xdist133-coverage55
6250
python: 'pypy3'
63-
- env: TOXENV=py36-pytest62-xdist202-coverage53
51+
- env: TOXENV=py36-pytest62-xdist202-coverage55
6452
python: '3.6'
65-
- env: TOXENV=py37-pytest62-xdist202-coverage53
53+
- env: TOXENV=py37-pytest62-xdist202-coverage55
6654
python: '3.7'
67-
- env: TOXENV=py38-pytest62-xdist202-coverage53
55+
- env: TOXENV=py38-pytest62-xdist202-coverage55
6856
python: '3.8'
69-
- env: TOXENV=py39-pytest62-xdist202-coverage53
57+
- env: TOXENV=py39-pytest62-xdist202-coverage55
7058
python: '3.9'
71-
- env: TOXENV=pypy3-pytest62-xdist202-coverage53
59+
- env: TOXENV=pypy3-pytest62-xdist202-coverage55
7260
python: 'pypy3'
7361

7462
- stage: examples

tests/test_pytest_cov.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,6 @@ def test_central_coveragerc(testdir, prop):
498498
'test_central_coveragerc* %s *' % prop.result,
499499
'*10 passed*',
500500
])
501-
502-
# single-module coverage report
503-
assert all(not line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
504-
505501
assert result.ret == 0
506502

507503

@@ -536,10 +532,6 @@ def test_central_with_path_aliasing(testdir, monkeypatch, opts, prop):
536532
'src[\\/]mod* %s *' % prop.result,
537533
'*10 passed*',
538534
])
539-
540-
# single-module coverage report
541-
assert all(not line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
542-
543535
assert result.ret == 0
544536

545537

@@ -642,9 +634,6 @@ def test_show_missing_coveragerc(testdir, prop):
642634
'*10 passed*',
643635
])
644636

645-
# single-module coverage report
646-
assert all(not line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
647-
648637
assert result.ret == 0
649638

650639

tox.ini

Lines changed: 6 additions & 4 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-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}
16+
py{27,35,36,37,py,py3}-pytest46-xdist127-coverage{55}
17+
py{36,37,38,py3}-pytest{46,54}-xdist133-coverage{55}
18+
py{36,37,38,39,py3}-pytest{62}-xdist202-coverage{55}
1919
docs
2020

2121
[testenv]
@@ -29,7 +29,7 @@ setenv =
2929
pytest54: _DEP_PYTEST=pytest==5.4.3
3030
pytest60: _DEP_PYTEST=pytest==6.0.2
3131
pytest61: _DEP_PYTEST=pytest==6.1.2
32-
pytest62: _DEP_PYTEST=pytest==6.2.1
32+
pytest62: _DEP_PYTEST=pytest==6.2.2
3333

3434
xdist127: _DEP_PYTESTXDIST=pytest-xdist==1.27.0
3535
xdist129: _DEP_PYTESTXDIST=pytest-xdist==1.29.0
@@ -47,6 +47,8 @@ setenv =
4747
coverage51: _DEP_COVERAGE=coverage==5.1
4848
coverage52: _DEP_COVERAGE=coverage==5.2.1
4949
coverage53: _DEP_COVERAGE=coverage==5.3.1
50+
coverage54: _DEP_COVERAGE=coverage==5.4
51+
coverage55: _DEP_COVERAGE=coverage==5.5
5052
# For testing against a coverage.py working tree.
5153
coveragedev: _DEP_COVERAGE=-e{env:COVERAGE_HOME}
5254
passenv =

0 commit comments

Comments
 (0)