Skip to content

Commit

Permalink
Merge 5d586bb into 4aec164
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinCawley authored May 20, 2021
2 parents 4aec164 + 5d586bb commit 6f5a43c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tardis/montecarlo/montecarlo_numba/formal_integral.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tardis_env3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- scipy=1.5
- pandas=1.0
- astropy=3
- numba=0.50
- numba=0.53.1
- numexpr

# Plasma
Expand Down

0 comments on commit 6f5a43c

Please sign in to comment.