diff --git a/environment.yml b/environment.yml index 7b92f6b51c85e40c2e223e53b61553ed6523b0b2..48d2570de217b3c38c6a4345574be00b3a6f698a 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: - numpy>=1.12 - flask>=0.10.1 -- scipy +- scipy>=0.14.0 - six - h5py - pandas diff --git a/pykat/math/zernike.py b/pykat/math/zernike.py index 3c9bb11f26da24437e4ca5b404c356345359a849..c9684382286136b9a823f7b411ce09e04316ad3d 100644 --- a/pykat/math/zernike.py +++ b/pykat/math/zernike.py @@ -1,5 +1,5 @@ import numpy as np -from scipy.misc import factorial as fac +from scipy.special import factorial as fac from six.moves import xrange import math diff --git a/pykat/optics/knm.py b/pykat/optics/knm.py index 8c919880163c2707596455b40f96f1088cb9045b..ac548d3ab4c5572069b4f52e8481563c957a6d13 100644 --- a/pykat/optics/knm.py +++ b/pykat/optics/knm.py @@ -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.misc 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 diff --git a/requirements.txt b/requirements.txt index 22f6ae043e9e8dabb0200aa79612b90850cc5aab..ced671a3d9b895bc1c0860ea8a999d59e203843f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ numpy >= 1.12 flask >= 0.10.1 -scipy +scipy >= 0.14.0 six h5py pandas matplotlib -tabulate \ No newline at end of file +tabulate