Merge remote-tracking branch 'upstream/develop' into partial_sab

This commit is contained in:
Sterling Harper 2017-07-10 15:31:13 -04:00
commit ba5b54dc88
4 changed files with 30 additions and 30 deletions

View file

@ -25,8 +25,9 @@ except ImportError:
MOCK_MODULES = ['numpy', 'numpy.polynomial', 'numpy.polynomial.polynomial',
'h5py', 'pandas', 'uncertainties', 'openmoc',
'openmc.data.reconstruct']
'scipy', 'scipy.sparse', 'scipy.interpolate', 'scipy.integrate',
'scipy.optimize', 'scipy.special', 'h5py', 'pandas',
'uncertainties', 'openmoc', 'openmc.data.reconstruct']
sys.modules.update((mod_name, MagicMock()) for mod_name in MOCK_MODULES)
import numpy as np