Merge pull request #758 from wkerzendorf/test_env

Add new version to tardis_env27 and add pyne

tardis/atomic.py

@@ -493,7 +493,7 @@ def prepare_atom_data(self, selected_atomic_numbers, line_interaction_type='scat
             self.lines = self.lines[self.lines['ion_number'] <= max_ion_number]
 
         # self.lines.sort(['wavelength', 'line_id'], inplace=True)
-        self.lines.sort(['wavelength'], inplace=True)
+        self.lines.sort_values(by='wavelength', inplace=True)
         self.lines.set_index('line_id', inplace=True)
 
 
@@ -672,4 +672,3 @@ def get_collision_matrix(self, species, t_electrons):
                                            t_electrons.reshape((1, 1, t_electrons.shape[0]))) * \
                       self.g_ratio_matrices[species].reshape((no_of_levels, no_of_levels, 1))
         return c_ul_matrix + c_lu_matrix.transpose(1, 0, 2)
-

tardis/montecarlo/tests/test_formal_integral.py

@@ -49,7 +49,7 @@ def test_trapezoid_integration(clib, N):
     func = clib.trapezoid_integration
     func.restype = c_double
     h = 1.
-
+    N = int(N)
     func.argtypes = [
             ndpointer(c_double),
             c_double,

tardis_env27.yml

@@ -1,20 +1,25 @@
 name: tardis
+
+channels:
+    - defaults
+    - conda-forge
+
 dependencies:
 - python=2.7
-- numpy=1.10
-- scipy=0.17.0
-- pandas=0.16.2
-- pytables=3.2.2
-- h5py=2.5
-- matplotlib=1.4.3
-- astropy=1.1.2
-- numexpr=2.4.4
+- numpy=1.12
+- scipy=0.18
+- pandas=0.20
+- pytables
+- h5py=2.6
+- matplotlib=2.0
+- astropy=1.3
+- numexpr=2.6
 - Cython=0.21
 - networkx=1.10
 - pytest=3.0
 - pyyaml=3.12
 - jsonschema=2.5.1
-
+- pyne=0.5.3
 
 # RTD requirements
 - sphinx=1.5.1