Merge pull request #928 from paulromano/travis-fail-fast

Make sure Travis checks results of regression and unit tests
This commit is contained in:
Sterling Harper 2017-11-08 08:17:31 -05:00 committed by GitHub
commit 0ca6f416d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -61,7 +61,7 @@ script:
- if [[ $OPENMC_CONFIG == "check_source" ]]; then
./check_source.py;
else
./run_tests.py -C $OPENMC_CONFIG -j 2;
./run_tests.py -C $OPENMC_CONFIG -j 2 &&
pytest --cov=../openmc unit_tests/;
fi
- cd ..

View file

@ -61,7 +61,7 @@ kwargs = {
# Required dependencies
'install_requires': [
'six', 'numpy>=1.9', 'h5py', 'scipy', 'ipython', 'matplotlib',
'pandas>=0.17.0', 'lxml', 'uncertainties'
'pandas<0.21.0', 'lxml', 'uncertainties'
],
# Optional dependencies