Merge pull request #83 from rmarkello/fix/voneconomo

[ENH] Adds info CSV file to von Economo fetcher

Author: rmarkello

netneurotools/data/osf.json

@@ -357,6 +357,6 @@
             "mb37e",
             "5ed80005fabc45000d639900"
         ],
-        "md5": "28fb2bb04fbb2a1d65428364b48cf6ac"
+        "md5": "67085e2577d21dc3a742f4fcde6e3b18"
     }
 }

netneurotools/datasets/fetchers.py

@@ -647,7 +647,7 @@ def fetch_voneconomo(data_dir=None, url=None, resume=True, verbose=1):
     """
 
     dataset_name = 'atl-voneconomo_koskinas'
-    keys = ['gcs', 'ctab']
+    keys = ['gcs', 'ctab', 'info']
 
     data_dir = _get_data_dir(data_dir=data_dir)
     info = _get_dataset_info(dataset_name)
@@ -661,9 +661,9 @@ def fetch_voneconomo(data_dir=None, url=None, resume=True, verbose=1):
     filenames = [
         'atl-vonEconomoKoskinas_hemi-{}_probabilistic.{}'.format(hemi, suff)
         for hemi in ['L', 'R'] for suff in ['gcs', 'ctab']
-    ]
+    ] + ['atl-vonEconomoKoskinas_info.csv']
     files = [(op.join(dataset_name, f), url, opts) for f in filenames]
     data = _fetch_files(data_dir, files=files, resume=resume, verbose=verbose)
-    data = [ANNOT(*data[n::2]) for n in range(len(keys))]
+    data = [ANNOT(*data[:-1:2])] + [ANNOT(*data[1:-1:2])] + [data[-1]]
 
     return Bunch(**dict(zip(keys, data)))

netneurotools/tests/test_datasets.py

@@ -151,6 +151,7 @@ def test_fetch_hcp_standards(tmpdir):
 def test_fetch_voneconomo(tmpdir):
     vek = datasets.fetch_voneconomo(data_dir=tmpdir, verbose=0)
     assert all(hasattr(vek, k) and len(vek[k]) == 2 for k in ['gcs', 'ctab'])
+    assert isinstance(vek.get('info'), str)
 
 
 @pytest.mark.parametrize('dset, expected', [