scipy mandatory

scipy prereq

setup.cfg

@@ -35,6 +35,7 @@ install_requires =
   xarray
   requests
   python-dateutil
+  scipy>=0.17
   cdflib>=0.3.6
 
 [options.extras_require]
@@ -52,7 +53,6 @@ io =
   netcdf4
   h5py
 fov =
-  scipy>=0.17
   histutils
   pymap3d
 cameras =

tests/test_load.py

@@ -67,7 +67,6 @@ def test_read_timereq():
 
 @pytest.mark.filterwarnings('ignore:Not able to verify number of bytes from header')
 def test_calread_idl():
-    pytest.importorskip('scipy')
 
     cal1 = ta.loadcal(cal1fn)
 

themisasi/io.py

@@ -11,6 +11,7 @@
 import numpy as np
 from dateutil.parser import parse
 import cdflib
+import scipy.io
 try:
     import h5py
 except ImportError:
@@ -19,10 +20,7 @@
     from netCDF4 import Dataset
 except ImportError:
     Dataset = None
-try:
-    from scipy.io import readsav
-except ImportError:
-    readsav = None
+
 
 Epoch = cdflib.cdfepoch()
 
@@ -180,11 +178,8 @@ def loadcal(fn: Path, imgs: xarray.Dataset=None) -> xarray.Dataset:
         x = y = h[f'thg_asf_{site}_c256']
         time = datetime.utcfromtimestamp(h[f'thg_asf_{site}_time'][-1])
     elif fn.suffix == '.sav':
-        if readsav is None:
-            raise ImportError('pip install scipy')
-
         site = fn.name.split('_')[2]
-        h = readsav(fn, python_dict=True, verbose=False)
+        h = scipy.io.readsav(fn, python_dict=True, verbose=False)
         az = h['skymap']['full_azimuth'][0]
         el = h['skymap']['full_elevation'][0]
         lat = h['skymap']['site_map_latitude'].item()