Merge pull request #154 from tsalo/py3.5

[TST] Support Python 3.5

.travis.yml

@@ -1,18 +1,24 @@
 language: python
 sudo: false
 
-python:
-    - 3.6
-    - 3.7-dev
-
 matrix:
   include:
+    - python: 3.5
+      env:
+        - STYLE=0
+        - COVERAGE=0
     - python: 3.6
       env:
         - STYLE=1
+        - COVERAGE=0
     - python: 3.6
       env:
+        - STYLE=0
         - COVERAGE=1
+    - python : 3.7-dev
+      env:
+        - STYLE=0
+        - COVERAGE=0
 
 before_install:
     - python -m pip install --upgrade pip

tedana/decomposition/eigendecomp.py

@@ -237,7 +237,7 @@ def tedpca(catd, OCcatd, combmode, mask, t2s, t2sG, stabilize,
         varex_norm_min = pcastate['varex_norm_min']
         varex_norm_cum = pcastate['varex_norm_cum']
 
-    np.savetxt('mepca_mix.1D', comp_ts)
+    np.savetxt('mepca_mix.1D', comp_ts.T)
 
     # write component maps to 4D image
     comp_maps = np.zeros((OCcatd.shape[0], comp_ts.shape[0]))

tedana/info.py

@@ -66,6 +66,7 @@
     'Intended Audience :: Science/Research',
     'Topic :: Scientific/Engineering :: Information Analysis',
     'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7'
 ]

tedana/workflows/t2smap.py

@@ -158,7 +158,7 @@ def t2smap_workflow(data, tes, mask=None, fitmode='all', combmode='t2s',
 
     try:
         ref_label = os.path.basename(ref_img).split('.')[0]
-    except TypeError:
+    except (TypeError, AttributeError):
         ref_label = os.path.basename(str(data[0])).split('.')[0]
 
     if label is not None:

tedana/workflows/tedana.py

@@ -271,7 +271,7 @@ def tedana_workflow(data, tes, mask=None, mixm=None, ctab=None, manacc=None,
 
     try:
         ref_label = op.basename(ref_img).split('.')[0]
-    except TypeError:
+    except (TypeError, AttributeError):
         ref_label = op.basename(str(data[0])).split('.')[0]
 
     if label is not None: