Skip to content

Commit cf8672d

Browse files
committed
Changed to use Pytest as the test runner jpadilla#111
1 parent b39b9a7 commit cf8672d

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

.coveragerc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
[run]
2-
append = True
3-
source = jwt
2+
omit =
3+
tests/*
4+
.tox/*
5+
setup.py

setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ max-line-length = 119
33

44
[wheel]
55
universal = 1
6+
7+
[pytest]
8+
addopts = --cov-report term-missing --cov-config=.coveragerc --cov

tox.ini

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,49 @@ envlist = py26, py27, py27-contrib-crypto, py27-nocrypto, py32, py33, py34, py34
33

44
[testenv]
55
commands =
6-
coverage erase
7-
coverage run setup.py test
8-
coverage report -m
6+
py.test .
97
deps =
10-
cryptography
118
unittest2
12-
coverage
9+
cryptography
10+
pytest
11+
pytest-cov
1312

1413
[testenv:py34-contrib-crypto]
1514
basepython = python3.4
1615
commands =
17-
coverage erase
18-
coverage run setup.py test
19-
coverage report -m
16+
py.test .
2017
deps =
2118
pycrypto
2219
ecdsa
23-
coverage
20+
pytest
21+
pytest-cov
22+
2423

2524
[testenv:py27-contrib-crypto]
2625
basepython = python2.7
2726
commands =
28-
coverage erase
29-
coverage run setup.py test
30-
coverage report -m
27+
py.test .
3128
deps =
3229
pycrypto
3330
ecdsa
34-
coverage
31+
pytest
32+
pytest-cov
3533

3634
[testenv:py34-nocrypto]
3735
basepython = python3.4
3836
commands =
39-
coverage erase
40-
coverage run setup.py test
41-
coverage report -m
37+
py.test .
4238
deps =
43-
coverage
39+
pytest
40+
pytest-cov
4441

4542
[testenv:py27-nocrypto]
4643
basepython = python2.7
4744
commands =
48-
coverage erase
49-
coverage run setup.py test
50-
coverage report -m
45+
py.test .
5146
deps =
52-
coverage
47+
pytest
48+
pytest-cov
5349

5450
[testenv:pep8]
5551
basepython = python2.7

0 commit comments

Comments
 (0)