Skip to content

Commit fd6106a

Browse files
committed
Falling back to use pytest on travis
Unfortunately we can't use tox to test the package on travis because when we start tracking coverage from the tox run, we can't obtain the coverage exactly because tox runs the tests in another process :(
1 parent eefbcbc commit fd6106a

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
language: python
2-
python: 2.7
3-
env:
4-
- TOX_ENV=py26
5-
- TOX_ENV=py27
6-
- TOX_ENV=py32
7-
- TOX_ENV=py33
8-
- TOX_ENV=pypy
2+
python:
3+
- 2.6
4+
- 2.7
5+
- 3.2
6+
- 3.3
7+
- 3.4
8+
- pypy
99

1010
install:
11-
- pip install tox coveralls --use-wheel
11+
- pip install coveralls --use-wheel
1212

1313
script:
14-
- coverage run --source=pytest_mock.py runtox.py -e $TOX_ENV
14+
- python setup.py develop
15+
- coverage run --source=pytest_mock.py runtests.py
1516

1617
after_success:
1718
- coveralls

runtox.py renamed to runtests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# simple pytest wrapper so we can execute it using "coverage run"
2-
import tox, sys
3-
sys.exit(tox.cmdline())
2+
import pytest, sys
3+
sys.exit(pytest.main())

0 commit comments

Comments
 (0)