Commit 3e86cf3d authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Moved scipy import to function level to avoid static TLS ImportError. Updated version info.


Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 5cbef3d9
Pipeline #12866 passed with stages
in 34 seconds
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
History History
======= =======
0.3.5 (2020-09-24)
------------------
* Moved scipy import to function level to avoid static TLS ImportError.
0.3.4 (2020-09-15) 0.3.4 (2020-09-15)
------------------ ------------------
......
...@@ -34,7 +34,6 @@ import warnings ...@@ -34,7 +34,6 @@ import warnings
import numpy as np import numpy as np
from pandas import DataFrame, Series from pandas import DataFrame, Series
from matplotlib import pyplot as plt from matplotlib import pyplot as plt
from scipy.interpolate import interp1d
from . import __path__ from . import __path__
from .sensorspecs import get_LayerBandsAssignment from .sensorspecs import get_LayerBandsAssignment
...@@ -153,6 +152,7 @@ class RelativeSpectralResponse(object): ...@@ -153,6 +152,7 @@ class RelativeSpectralResponse(object):
:param rsr_dict: {'key_LayerBandsAssignment': <2D array: cols=[wvl,resp],rows=samples>} :param rsr_dict: {'key_LayerBandsAssignment': <2D array: cols=[wvl,resp],rows=samples>}
""" """
from scipy.interpolate import interp1d
is_nm = [300 < np.max(rsr_dict[band][:, 0]) < 15000 for band in rsr_dict] is_nm = [300 < np.max(rsr_dict[band][:, 0]) < 15000 for band in rsr_dict]
assert len(set(is_nm)) == 1, "'rsr_dict' must contain only one wavelength unit." assert len(set(is_nm)) == 1, "'rsr_dict' must contain only one wavelength unit."
......
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>. # with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.3.4' __version__ = '0.3.5'
__versionalias__ = '20200915.01' __versionalias__ = '20200924.01'
Supports Markdown
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