Skip to content

Commit

Permalink
Merge pull request #80 from cxhernandez/fix-travis
Browse files Browse the repository at this point in the history
fix travis
  • Loading branch information
cxhernandez authored Mar 30, 2017
2 parents 5139d5a + aacff94 commit 162627c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
language: c
language: python
sudo: false
env:
matrix:
- CONDA_PY=3.4
- CONDA_PY=3.5
include:
matrix:
- python: 3.4
env: CONDA_PY=3.4
- python: 3.5
env: CONDA_PY=3.5
branches:
only:
- master
Expand Down
4 changes: 1 addition & 3 deletions devtools/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ requirements:
- pandas
- msmbuilder
- mdtraj
- nglview
- matplotlib
- seaborn
- statsmodels
- networkx
- corner
- six

test:

Expand All @@ -43,7 +41,7 @@ test:
- matplotlib

commands:
- nosetests -v msmexplorer --with-timer --with-coverage --cover-package=msmexplorer
- QT_QPA_PLATFORM="offscreen" nosetests -v msmexplorer --with-timer --with-coverage --cover-package=msmexplorer

about:
home: https://github.com/msmexplorer/msmexplorer
Expand Down

0 comments on commit 162627c

Please sign in to comment.