Make sure Travis checks results of regression and unit tests

ChasingNeutrons · Nov 8, 2017 · 05250cd · 05250cd
1 parent 1abb1bf
commit 05250cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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 ..
diff --git a/setup.py b/setup.py
@@ -61,7 +61,7 @@
     # 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