Skip to content

Commit a671f14

Browse files
committed
Merge pull request #18 from phobson/pytest
Switch to pytest
2 parents 025f52d + 0681ac7 commit a671f14

24 files changed

+313
-316
lines changed

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ matrix:
55
- python: 2.7
66
env:
77
- COVERAGE=false
8+
- ARGS="--cov --verbose"
89
- python: 3.4
910
env:
1011
- COVERAGE=false
12+
- ARGS="--mpl --cov --verbose"
1113
- python: 3.5
1214
env:
1315
- COVERAGE=false
16+
- ARGS="--mpl --cov --verbose"
1417
- python: 3.5
1518
env:
1619
- COVERAGE=true
20+
- ARGS="--mpl --cov --verbose"
1721

1822
before_install:
1923

@@ -32,13 +36,14 @@ install:
3236

3337
- conda create --yes -n test python=$TRAVIS_PYTHON_VERSION
3438
- source activate test
35-
- conda install --yes numpy nose matplotlib coverage docopt requests pyyaml
39+
- conda install --yes numpy matplotlib coverage docopt requests pyyaml
40+
- conda install --yes --channel=conda-forge pytest pytest-cov pytest-mpl
3641
- if [ ${COVERAGE} = true ]; then conda install scipy --yes; fi
3742
- pip install coveralls
3843
- pip install .
3944

4045
script:
41-
- python check_probscale.py --with-coverage --cover-package=probscale --verbose
46+
- python check_probscale.py ${ARGS}
4247

4348
after_success:
4449
- if [ ${COVERAGE} = true ]; then coveralls; fi

check_probscale.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import sys
12
import matplotlib
23
matplotlib.use('agg')
34

4-
import nose
5-
nose.main()
5+
import pytest
6+
status = pytest.main(sys.argv[1:])
7+
sys.exit(status)
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)