Merge 7fb0ccc into 8e5ffe1

tardis-sn · May 20, 2021 · 7b2b4c3 · 7b2b4c3
2 parents 8e5ffe1 + 7fb0ccc
commit 7b2b4c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tardis/montecarlo/montecarlo_numba/formal_integral.py b/tardis/montecarlo/montecarlo_numba/formal_integral.py
@@ -6,7 +6,8 @@
 from scipy.interpolate import interp1d
 from astropy import units as u
 from tardis import constants as const
-from numba import njit, char, float64, int64, jitclass, typeof, byte, prange
+from numba import njit, char, float64, int64, typeof, byte, prange
+from numba.experimental import jitclass
 import pdb
 
 from tardis.montecarlo.montecarlo_numba.numba_config import SIGMA_THOMSON

diff --git a/tardis_env3.yml b/tardis_env3.yml
@@ -10,7 +10,7 @@ dependencies:
   - scipy=1.5
   - pandas=1.0
   - astropy=3
-  - numba=0.50
+  - numba
   - numexpr
 
   # Plasma