small bugfix wrt dependecies

Author: ThomasLecocq

msnoise/api.py

@@ -25,13 +25,9 @@
 import pandas as pd
 import scipy as sp
 import scipy.signal as ss
-if sp.__version__ < "1.4.0":
-    import scipy.fftpack as sf
-    from scipy.fftpack.helper import next_fast_len
-    import scipy.fftpack._fftpack as sff
-else:
-    import scipy.fft as sf
-    from scipy.fft import next_fast_len
+
+import scipy.fft as sf
+from scipy.fft import next_fast_len
 
 
 import scipy.optimize
@@ -1659,7 +1655,7 @@ def check_and_phase_shift(trace, taper_length=20.0):
         FFTdata = FFTdata * np.exp(1j * 2. * np.pi * fftfreq * dt)
         FFTdata = FFTdata.astype(np.complex64)
         sf.ifft(FFTdata, n=n, overwrite_x=True)
-        trace.data = np.real(FFTdata[:len(trace.data)]).astype(np.float)
+        trace.data = np.real(FFTdata[:len(trace.data)]).astype(float)
         trace.stats.starttime += dt
         del FFTdata, fftfreq
         clean_scipy_cache()
@@ -1768,25 +1764,26 @@ def make_same_length(st):
 def clean_scipy_cache():
     """This functions wraps all destroy scipy cache at once. It is a workaround
     to the memory leak induced by the "caching" functions in scipy fft."""
-    if scipy.__version__ >= "1.4.0":
-        return
-    sff.destroy_zfft_cache()
-    sff.destroy_zfftnd_cache()
-    sff.destroy_drfft_cache()
-    sff.destroy_cfft_cache()
-    sff.destroy_cfftnd_cache()
-    sff.destroy_rfft_cache()
-    sff.destroy_ddct2_cache()
-    sff.destroy_ddct1_cache()
-    # sff.destroy_ddct4_cache()
-    sff.destroy_dct2_cache()
-    sff.destroy_dct1_cache()
-    # sff.destroy_dct4_cache()
-    sff.destroy_ddst2_cache()
-    sff.destroy_ddst1_cache()
-    sff.destroy_dst2_cache()
-    sff.destroy_dst1_cache()
-    sf.convolve.destroy_convolve_cache()
+    return
+    # if scipy.__version__ >= "1.4.0":
+    #     return
+    # sff.destroy_zfft_cache()
+    # sff.destroy_zfftnd_cache()
+    # sff.destroy_drfft_cache()
+    # sff.destroy_cfft_cache()
+    # sff.destroy_cfftnd_cache()
+    # sff.destroy_rfft_cache()
+    # sff.destroy_ddct2_cache()
+    # sff.destroy_ddct1_cache()
+    # # sff.destroy_ddct4_cache()
+    # sff.destroy_dct2_cache()
+    # sff.destroy_dct1_cache()
+    # # sff.destroy_dct4_cache()
+    # sff.destroy_ddst2_cache()
+    # sff.destroy_ddst1_cache()
+    # sff.destroy_dst2_cache()
+    # sff.destroy_dst1_cache()
+    # sf.convolve.destroy_convolve_cache()
 
 
 def preload_instrument_responses(session):

msnoise/move2obspy.py

@@ -3,13 +3,9 @@
 
 import numpy as np
 import scipy
-if scipy.__version__ < "1.4.0":
-    import scipy.fftpack as sf
-    from scipy.fftpack.helper import next_fast_len
-    import scipy.fftpack._fftpack as sff
-else:
-    import scipy.fft as sf
-    from scipy.fft import next_fast_len
+
+import scipy.fft as sf
+from scipy.fft import next_fast_len
 
 import scipy.optimize
 import scipy.signal
@@ -398,7 +394,7 @@ def mwcs(current, reference, freqmin, freqmax, df, tmin, window_length, step,
     delta_mcoh = []
     time_axis = []
 
-    window_length_samples = np.int(window_length * df)
+    window_length_samples = int(window_length * df)
     # try:
     #     from sf.helper import next_fast_len
     # except ImportError:

msnoise/preprocessing.py

@@ -141,14 +141,16 @@ def preprocess(db, stations, comps, goal_day, params, responses=None):
                         try:
                             # print("Reading %s" % file)
                             # t=  time.time()
-                            st = read(file, dytpe=np.float,
+                            st = read(file, dytpe=float,
                                       starttime=UTCDateTime(gd),
                                       endtime=UTCDateTime(gd)+86400,
                                       station=sta,
                                       format=params.archive_format or None)
                             # print("done in", time.time()-t)
                         except:
                             logger.debug("ERROR reading file %s" % file)
+                            import traceback
+                            traceback.print_exc()
                             # TODO add traceback (optional?)
                             continue
                     for tr in st:
@@ -163,7 +165,7 @@ def preprocess(db, stations, comps, goal_day, params, responses=None):
                     else:
                         st = tmp
                     for tr in st:
-                        tr.data = tr.data.astype(np.float)
+                        tr.data = tr.data.astype(float)
                         tr.stats.network = tr.stats.network.upper()
                         tr.stats.station = tr.stats.station.upper()
                         tr.stats.channel = tr.stats.channel.upper()

msnoise/stretch.py

@@ -3,7 +3,7 @@
 """
 
 from .api import *
-from scipy import asarray as ar
+from numpy import asarray as ar
 from scipy.optimize import curve_fit
 from scipy.ndimage import map_coordinates