Merge tag 'v0.7.1'

openmc-dev · Dec 23, 2015 · 77237af · 77237af
2 parents 31c1f86 + 97fd5e1
commit 77237af
Show file tree

Hide file tree

Showing 584 changed files with 35,931 additions and 31,425 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,8 @@ src/xml-fortran/xmlreader
 
 # Test results error file
 results_error.dat
+inputs_error.dat
+results_test.dat
 
 # Test build files
 tests/build/
@@ -62,4 +64,13 @@ data/nndc
 .idea/*
 
 # IPython notebook checkpoints
-.ipynb_checkpoints
+.ipynb_checkpoints
+
+# Multi-group cross section IPython Notebook
+docs/source/pythonapi/examples/*.xml
+docs/source/pythonapi/examples/*.png
+docs/source/pythonapi/examples/*.xls
+docs/source/pythonapi/examples/mgxs
+docs/source/pythonapi/examples/tracks
+docs/source/pythonapi/examples/fission-rates
+docs/source/pythonapi/examples/plots
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ before_install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy h5py
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy h5py pandas
   - source activate test-environment
 
   # Install GCC, MPICH, HDF5, PHDF5