Skip to content

Commit 2a0986f

Browse files
committed
WIP: update recipe and tester
1 parent 9c0fdba commit 2a0986f

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

check_probscale.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
import matplotlib
33
matplotlib.use('agg')
44

5-
import pytest
6-
status = pytest.main(sys.argv[1:])
5+
import probscale
6+
status = probscale.test(*sys.argv[1:])
77
sys.exit(status)

conda.recipe/meta.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
package:
22
name: mpl-probscale
3-
version: 0.1.2dev
3+
version: 0.2.0dev
44

55
source:
66
path: ../
77

88
build:
99
script: python setup.py install
10-
number: 2
10+
number: 1
1111

1212
requirements:
1313
build:
1414
- python
15+
- setuptools
1516
- numpy
1617
- matplotlib
17-
- nose
1818

1919
run:
2020
- python
2121
- numpy
2222
- matplotlib
23-
- nose
23+
- pytest
2424

2525
test:
2626
imports:
2727
- probscale
2828

2929
commands:
30-
- python -c "import matplotlib; matplotlib.use('agg'); import probscale; probscale.test()"
30+
- python -c "import matplotlib as mpl; mpl.use('agg'); import probscale as ps; ps.test()"
3131

3232
requires:
33-
- nose
33+
- pytest
3434
- scipy
3535

3636
about:

probscale/tests/__init__.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
from numpy.testing import Tester
2-
test = Tester().test
1+
from pkg_resources import resource_filename
2+
3+
import pytest
4+
5+
import probscale
6+
7+
def test(*args):
8+
options = [resource_filename('probscale', 'tests')]
9+
options.extend(list(args))
10+
return pytest.main(options)

0 commit comments

Comments
 (0)