Skip to content

Commit 08e0e3b

Browse files
committed
add mock to travis and recipe for py2.7
1 parent 0278f79 commit 08e0e3b

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@ matrix:
55
- python: 2.7
66
env:
77
- COVERAGE=false
8+
- TESTERS="conda-forge pytest mock pytest-mpl coverage"
89
- ARGS="--verbose"
910
- python: 3.4
1011
env:
1112
- COVERAGE=false
13+
- TESTERS="conda-forge pytest pytest-mpl coverage"
1214
- ARGS="--mpl --verbose"
1315
- python: 3.5
1416
env:
1517
- COVERAGE=false
18+
- TESTERS="conda-forge pytest pytest-mpl coverage"
1619
- ARGS="--mpl --verbose"
1720
- python: 3.5
1821
env:
1922
- COVERAGE=true
23+
- TESTERS="conda-forge pytest pytest-mpl coverage"
2024
- ARGS="--mpl --verbose"
2125

2226
before_install:
@@ -36,8 +40,8 @@ install:
3640

3741
- conda create --yes -n test python=$TRAVIS_PYTHON_VERSION
3842
- source activate test
39-
- conda install --yes --channel=conda-forge numpy matplotlib coverage docopt requests pyyaml
40-
- conda install --yes --channel=conda-forge pytest pytest-cov pytest-mpl
43+
- conda install --yes --channel=conda-forge numpy matplotlib docopt requests pyyaml
44+
- conda install --yes --channel=${TESTERS}
4145
- if [ ${COVERAGE} = true ]; then conda install scipy --yes; fi
4246
- pip install coveralls
4347
- pip install .

conda.recipe/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ test:
3030
- python -c "import sys; import matplotlib as mpl; mpl.use('agg'); import probscale as ps; sys.exit(ps.test('--mpl'))"
3131

3232
requires:
33+
- mock # [py27]
3334
- pytest
3435
- pytest-mpl
3536
- scipy

0 commit comments

Comments
 (0)