Merge fa0d06b into 1a9c842

.travis.yml

@@ -21,9 +21,9 @@ addons:
       - liblapack-dev  # scipy
 
 python:
-  - '2.6'
   - '2.7'
   - '3.5'
+  - '3.6'
 
 env:
   global:
@@ -33,20 +33,14 @@ env:
     - PIP_FLAGS="--quiet"
 
 matrix:
-  exclude:
-    - python: '2.6'
-      env: PIP_FLAGS="--quiet --pre"
   allow_failures:
-    - python: '2.6'
     - python: '3.5'
+    - python: '3.6'
   fast_finish: true
 
 before_install:
   - pip install -q --upgrade pip
-  # need to install astropy 1.1 specifically for py26
-  - if [[ ${TRAVIS_PYTHON_VERSION} == '2.6' ]]; then pip install "astropy==1.1"; fi
   - pip install ${PIP_FLAGS} -r requirements.txt
-  - .travis/build-lal.sh
   - pip install ${PIP_FLAGS} coveralls unittest2 pytest
 
 install:

bin/gwdetchar-scattering

@@ -25,19 +25,20 @@ from __future__ import division
 import os.path
 import re
 import warnings
-from StringIO import StringIO
+from collections import OrderedDict
+
+from six.moves import StringIO
 
 import numpy
 
 from matplotlib import (use, rcParams)
-use('agg')
+use('agg')  # nopep8
 
 import trigfind
 
 from glue.lal import Cache
 
 from gwpy.plotter import (figure, HistogramPlot)
-from gwpy.utils.compat import OrderedDict
 from gwpy.utils import gprint
 from gwpy.table import EventTable
 from gwpy.timeseries import TimeSeriesDict

requirements.txt

@@ -1,9 +1,10 @@
+numpy >= 1.10
+scipy >= 0.16
+matplotlib >= 1.4.1
+astropy >= 1.2
+gwpy >= 0.7
+lalsuite
+lscsoft-glue
+dqsegdb
 beautifulsoup4
-astropy
-m2crypto
-pykerberos
-python-cjson
-http://software.ligo.org/lscsoft/source/glue-1.54.1.tar.gz
-http://software.ligo.org/lscsoft/source/dqsegdb-1.4.0.tar.gz
 https://github.com/ligovirgo/trigfind/archive/v0.3.tar.gz
-gwpy>=0.4

setup.py

@@ -22,10 +22,6 @@
 
 from __future__ import print_function
 
-import sys
-if sys.version < '2.6':
-    raise ImportError("Python versions older than 2.6 are not supported.")
-
 import glob
 import os.path