Skip to content

Commit 9ca4241

Browse files
authored
Merge pull request #228 from asherf/newpytest
2 parents afb3e43 + 2d5d94a commit 9ca4241

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

requirements-dev.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
PyYAML==5.1
22
cov-core==1.15.0
3-
coverage==4.4
3+
coverage==5.5
44
coveralls==1.5.1
55
cryptography==3.3.2
66
docopt==0.6.2
7-
nose==1.3.6
8-
py==1.5.4
9-
pytest==4.6.10
10-
pytest-cov==2.6.1
7+
pytest==6.2.2
8+
pytest-cov==2.11.1
119
-r requirements.txt
1210
-r requirements-rtd.txt

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ skip_missing_interpreters = True
88
[testenv:basecommand]
99
commands =
1010
pip --version
11-
py.test --cov-report term-missing --cov jose {posargs}
11+
pytest --cov-report term-missing --cov jose {posargs}
1212

1313
[testenv:pypy-compatibility]
1414
# This testenv locks up during coverage so just run tests
1515
commands =
1616
pip --version
17-
py.test
17+
pytest
1818

1919
[testenv:pypy3-compatibility]
2020
# This testenv locks up during coverage so just run tests
2121
commands =
2222
pip --version
23-
py.test
23+
pytest
2424

2525
[testenv:compatibility]
2626
extras =

0 commit comments

Comments
 (0)