From 13b21f6e17c6fc88184ffd451202c638da87f187 Mon Sep 17 00:00:00 2001 From: Phil Jones Date: Tue, 11 Jun 2019 13:45:44 +0100 Subject: [PATCH] Fix broken imports in SciPy 1.3 A couple of imports have been removed from `scipy.misc` in version 1.3, and must be obtained from `scipy.special` instead. This requires at least SciPy 0.14.0. --- environment.yml | 2 +- pykat/math/zernike.py | 2 +- pykat/optics/knm.py | 3 +-- requirements.txt | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/environment.yml b/environment.yml index 7b92f6b..48d2570 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 3c9bb11..c968438 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 8c91988..ac548d3 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 22f6ae0..ced671a 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 -- GitLab