Commit cc9b6028 authored by Sean Leavey's avatar Sean Leavey

Merge branch 'master' into feature/cli

parents 01cb75fa 13b21f6e
......@@ -5,7 +5,7 @@ channels:
dependencies:
- numpy>=1.12
- flask>=0.10.1
- scipy
- scipy>=0.14.0
- six
- h5py
- pandas
......
......@@ -8,9 +8,8 @@ from scipy.integrate import dblquad
from pykat.optics.romhom import ROMWeights
from math import factorial
from pykat.math.hermite import hermite
from scipy.special import comb
from scipy.integrate import newton_cotes
from scipy.special import gammainc
from scipy.special import comb, gammainc
from pykat.math import newton_weights
import time
......
numpy >= 1.12
flask >= 0.10.1
scipy
scipy >= 0.14.0
six
h5py
pandas
matplotlib
tabulate
click >= 7.0
\ No newline at end of file
click >= 7.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment