remove the future module (gwastro#2162)

* remove old INSTALL parts

* remove future.y

* update scipy requirements

* update zpk to use scipy

* update results to use python htmlparser

* bump matplotlib requirements

* no more future module

Author: ahnitz

INSTALL

@@ -4,38 +4,16 @@ PyCBC installation instructions
 Prerequisites
 -------------
 
-* Python 2.6 or 2.7
-  Should be provided by the distribution.
-
-* python-decorator >= 3.3
-  Should be available in the distribution.
-  
-* argparse >= 1.2.0
-  Should be available in the distribution
-
-* Numpy >= 1.4.1 and Scipy >= 0.7.2
-  Should be installable either via the distribution packaging system,
-  pip or easy_install. Numpy >= 1.5.1 is required for GPU acceleration
-  via CUDA due to a bug in older versions.
-
 * LALSuite
   See https://www.lsc-group.phys.uwm.edu/daswg/docs/howto/lal-install.html
-  for installation instructions. LALSuite must be configured with the
-  --enable-swig-python option.
+  for instructions to install through source, or simply install the pre-built
+  version hosted on pypi using pip.
 
 Installing PyCBC
 ----------------
 
-    git clone https://github.com/ligo-cbc/pycbc.git
-    cd pycbc
-    python setup.py build
-    python setup.py install --user
-    python setup.py test
-
-For installing system-wide, replace the 'setup.py install' command with
-    sudo python setup.py install
-
-
+    pip install lalsuite pycbc
+    
 Installing CUDA Python modules
 ------------------------------
 

bin/plotting/pycbc_banksim_plot_eff_fitting_factor

@@ -84,11 +84,8 @@ if opt.filter_injections:
 
 fig = plt.figure()
 ax = fig.gca()
-try:
-    cmap = plt.get_cmap('viridis')
-except ValueError:
-    from pycbc.future import cmaps
-    cmap = cmaps['viridis']
+cmap = plt.get_cmap('viridis')
+
 
 if not opt.log_colorbar:
     sctr = ax.scatter(m1, m2, c=eff_ff, cmap=cmap, edgecolors='none',

bin/plotting/pycbc_banksim_plot_fitting_factors

@@ -75,11 +75,8 @@ eta = m1*m2 / (mtot*mtot)
 effspin = (s1z*m1 + s2z*m2) / mtot
 curr_fp.close()
 
-try:
-    cmap = plt.get_cmap('magma')
-except ValueError:
-    from pycbc.future import cmaps
-    cmap = cmaps['magma']
+
+cmap = plt.get_cmap('magma')
 
 def adjust_axes(ax_instance):
     """Adjust axes so that there is always a range of >= 0.1 on the plots."""

pycbc/filter/zpk.py

@@ -24,8 +24,7 @@
 
 import numpy as np
 
-from pycbc import future
-
+from scipy.signal import zpk2sos, sosfilt
 from pycbc.types import TimeSeries
 
 def filter_zpk(timeseries, z, p, k):
@@ -108,10 +107,10 @@ def filter_zpk(timeseries, z, p, k):
     k_zd = k * np.prod(fs - z) / np.prod(fs - p)
 
     # get second-order sections
-    sos = future.zpk2sos(z_zd, p_zd, k_zd)
+    sos = zpk2sos(z_zd, p_zd, k_zd)
 
     # filter
-    filtered_data = future.sosfilt(sos, timeseries.numpy())
+    filtered_data = sosfilt(sos, timeseries.numpy())
 
     return TimeSeries(filtered_data, delta_t = timeseries.delta_t,
                       dtype=timeseries.dtype,