Set back to development (gwastro#4796)

* Update setup.py

* update

* more changes for scipy

* update

* update

pycbc/psd/variation.py

@@ -164,7 +164,7 @@ def calc_filt_psd_variation(strain, segment, short_segment, psd_long_segment,
 
     # Create a bandpass filter between low_freq and high_freq
     filt = sig.firwin(4 * srate, [low_freq, high_freq], pass_zero=False,
-                      window='hann', nyq=srate / 2)
+                      window='hann', fs=srate)
     filt.resize(int(psd_duration * srate))
     # Fourier transform the filter and take the absolute value to get
     # rid of the phase.
@@ -284,7 +284,7 @@ def live_create_filter(psd_estimated,
                       [low_freq, high_freq],
                       pass_zero=False,
                       window='hann',
-                      nyq=sample_rate / 2)
+                      fs=sample_rate)
     filt.resize(int(psd_duration * sample_rate))
 
     # Fourier transform the filter and take the absolute value to get

pycbc/types/timeseries.py

@@ -745,7 +745,7 @@ def qtransform(self, delta_t=None, delta_f=None, logfsteps=None,
             The two dimensional interpolated qtransform of this time series.
         """
         from pycbc.filter.qtransform import qtiling, qplane
-        from scipy.interpolate import interp2d
+        from scipy.interpolate import RectBivariateSpline as interp2d
 
         if frange is None:
             frange = (30, int(self.sample_rate / 2 * 8))
@@ -759,10 +759,10 @@ def qtransform(self, delta_t=None, delta_f=None, logfsteps=None,
         # Interpolate if requested
         if delta_f or delta_t or logfsteps:
             if return_complex:
-                interp_amp = interp2d(times, freqs, abs(q_plane))
-                interp_phase = interp2d(times, freqs, _numpy.angle(q_plane))
+                interp_amp = interp2d(times, freqs, abs(q_plane.T))
+                interp_phase = interp2d(times, freqs, _numpy.angle(q_plane.T))
             else:
-                interp = interp2d(times, freqs, q_plane)
+                interp = interp2d(times, freqs, q_plane.T)
 
         if delta_t:
             times = _numpy.arange(float(self.start_time),
@@ -781,7 +781,7 @@ def qtransform(self, delta_t=None, delta_f=None, logfsteps=None,
             else:
                 q_plane = interp(times, freqs)
 
-        return times, freqs, q_plane
+        return times, freqs, q_plane.T
 
     def notch_fir(self, f1, f2, order, beta=5.0, remove_corrupted=True):
         """ notch filter the time series using an FIR filtered generated from

setup.py

@@ -118,8 +118,8 @@ def __getattr__(self, attr):
         vinfo = _version_helper.generate_git_version_info()
     except:
         vinfo = vdummy()
-        vinfo.version = '2.4.1'
-        vinfo.release = 'True'
+        vinfo.version = '2.4.dev2'
+        vinfo.release = 'False'
 
     version_script = f"""# coding: utf-8
 # Generated by setup.py for PyCBC on {vinfo.build_date}.