Merge remote-tracking branch 'gh-mvdoc/enh-anonym' into enh-dbic2

* gh-mvdoc/enh-anonym:
  Add test for add_rows_to_scans_keys_file
  BF: forgotten nipype

 Conflicts:
	setup.py -- both fixed for nipype

Author: yarikoptic

bin/heudiconv

@@ -990,26 +990,24 @@ def add_rows_to_scans_keys_file(fn, newrows):
     if lexists(fn):
         with open(fn, 'r') as csvfile:
             reader = csv.reader(csvfile, delimiter='\t')
-            existing_rows = [row[0] for row in reader]
+            existing_rows = [row for row in reader]
         # skip header
         fnames2info = {row[0]: row[1:] for row in existing_rows[1:]}
 
-        newrows_key = newrows.key()
+        newrows_key = newrows.keys()
         newrows_toadd = list(set(newrows_key) - set(fnames2info.keys()))
         for key_toadd in newrows_toadd:
             fnames2info[key_toadd] = newrows[key_toadd]
-        header = []
         # remove
         os.unlink(fn)
     else:
-        header = ['filename', 'acq_time', 'operator', 'randstr']
         fnames2info = newrows
 
+    header = ['filename', 'acq_time', 'operator', 'randstr']
     # save
     with open(fn, 'a') as csvfile:
         writer = csv.writer(csvfile, delimiter='\t')
-        if header:
-            writer.writerow(header)
+        writer.writerow(header)
         for key in sorted(fnames2info.keys()):
             writer.writerow([key] + fnames2info[key])
 

tests/test_main.py

@@ -1,3 +1,4 @@
+import csv
 import os
 import pytest
 import sys
@@ -134,5 +135,25 @@ def test_add_rows_to_scans_keys_file(tmpdir):
     }
     heudiconv.add_rows_to_scans_keys_file(fn, rows)
 
-    #with open(fn, 'r') as csvfile:
+    def _check_rows(fn, rows):
+        with open(fn, 'r') as csvfile:
+            reader = csv.reader(csvfile, delimiter='\t')
+            rows_loaded = []
+            for row in reader:
+                rows_loaded.append(row)
+        for i, row_ in enumerate(rows_loaded):
+            if i == 0:
+                assert(row_ == ['filename', 'acq_time', 'operator', 'randstr'])
+            else:
+                assert(rows[row_[0]] == row_[1:])
+
+    _check_rows(fn, rows)
+    # add a new one
+    extra_rows = {
+        'a_new_file.nii.gz': ['2016adsfasd23', '', 'fasadfasdf'],
+        'my_file.nii.gz': ['2016adsfasd', '', 'fasadfasdf'],
+        'another_file.nii.gz': ['2018xxxxx', '', 'fasadfasdf']
+    }
+    heudiconv.add_rows_to_scans_keys_file(fn, extra_rows)
+    _check_rows(fn, extra_rows)