Merge pull request #1174 from satra/fix/frompy3

fix: change how hash values are computed

Author: chrisgorgo

CHANGES

@@ -1,6 +1,7 @@
 Next release
 ============
 
+* API: Change how hash values are computed (https://github.com/nipy/nipype/pull/1174)
 * ENH: New interfaces for MRTrix3 (https://github.com/nipy/nipype/pull/1126)
 * ENH: New option in afni.3dRefit - zdel, ydel, zdel etc. (https://github.com/nipy/nipype/pull/1079)
 * FIX: ants.Registration composite transform outputs are no longer returned as lists (https://github.com/nipy/nipype/pull/1183)

nipype/interfaces/base.py

@@ -175,7 +175,14 @@ def __repr__(self):
         for k, v in sorted(self.items()):
             if not first:
                 outstr.append(', ')
-            outstr.append('%s=%r' % (k, v))
+            if isinstance(v, dict):
+                pairs = []
+                for key, value in sorted(v.items()):
+                    pairs.append("'%s': %s" % (key, value))
+                v = '{' + ', '.join(pairs) + '}'
+                outstr.append('%s=%s' % (k, v))
+            else:
+                outstr.append('%s=%r' % (k, v))
             first = False
         outstr.append(')')
         return ''.join(outstr)
@@ -537,8 +544,8 @@ def get_hashval(self, hash_method=None):
 
         """
 
-        dict_withhash = {}
-        dict_nofilename = {}
+        dict_withhash = []
+        dict_nofilename = []
         for name, val in sorted(self.get().items()):
             if isdefined(val):
                 trait = self.trait(name)
@@ -548,24 +555,24 @@ def get_hashval(self, hash_method=None):
                                                False)
                               and not has_metadata(trait.trait_type,
                                                    "name_source"))
-                dict_nofilename[name] = \
+                dict_nofilename.append((name,
                     self._get_sorteddict(val, hash_method=hash_method,
-                                         hash_files=hash_files)
-                dict_withhash[name] = \
+                                         hash_files=hash_files)))
+                dict_withhash.append((name,
                     self._get_sorteddict(val, True, hash_method=hash_method,
-                                         hash_files=hash_files)
-        return (dict_withhash, md5(str(dict_nofilename)).hexdigest())
+                                         hash_files=hash_files)))
+        return dict_withhash, md5(str(dict_nofilename)).hexdigest()
 
     def _get_sorteddict(self, object, dictwithhash=False, hash_method=None,
                         hash_files=True):
         if isinstance(object, dict):
-            out = {}
+            out = []
             for key, val in sorted(object.items()):
                 if isdefined(val):
-                    out[key] = \
+                    out.append((key,
                         self._get_sorteddict(val, dictwithhash,
                                              hash_method=hash_method,
-                                             hash_files=hash_files)
+                                             hash_files=hash_files)))
         elif isinstance(object, (list, tuple)):
             out = []
             for val in object:
@@ -1342,7 +1349,7 @@ class must be instantiated with a command argument
      'environ': {'DISPLAY': ':1'}, 'args': '-al'}
 
     >>> cli.inputs.get_hashval()
-    ({'args': '-al'}, 'a2f45e04a34630c5f33a75ea2a533cdd')
+    ([('args', '-al')], '11c37f97649cd61627f4afe5136af8c0')
 
     """
 

nipype/interfaces/tests/test_base.py

@@ -88,7 +88,7 @@ class spec(nib.TraitedSpec):
     specfunc = lambda x : spec(hoo=x)
     yield assert_raises, nib.traits.TraitError, specfunc, 1
     infields = spec(foo=1)
-    hashval = ({'foo': 1, 'goo': '0.0000000000'}, 'cb03be1c3182ff941eecea6440c910f0')
+    hashval = ([('foo', 1), ('goo', '0.0000000000')], 'e89433b8c9141aa0fda2f8f4d662c047')
     yield assert_equal, infields.get_hashval(), hashval
     #yield assert_equal, infields.hashval[1], hashval[1]
     yield assert_equal, infields.__repr__(), '\nfoo = 1\ngoo = 0.0\n'
@@ -314,7 +314,7 @@ class spec2(nib.TraitedSpec):
         doo = nib.traits.List(nib.File(exists=True))
     infields = spec2(moo=tmp_infile, doo=[tmp_infile])
     hashval = infields.get_hashval(hash_method='content')
-    yield assert_equal, hashval[1], '8c227fb727c32e00cd816c31d8fea9b9'
+    yield assert_equal, hashval[1], 'a00e9ee24f5bfa9545a515b7a759886b'
     teardown_file(tmpd)
 
 @skipif(checknose)
@@ -329,7 +329,7 @@ class spec2(nib.TraitedSpec):
         doo = nib.traits.List(nib.File(exists=True))
     infields = spec2(moo=nme, doo=[tmp_infile])
     hashval = infields.get_hashval(hash_method='content')
-    yield assert_equal, hashval[1], '642c326a05add933e9cdc333ce2d0ac2'
+    yield assert_equal, hashval[1], '8da4669ff5d72f670a46ea3e7a203215'
 
     class spec3(nib.TraitedSpec):
         moo = nib.File(exists=True, name_source="doo")

nipype/pipeline/engine.py

@@ -1471,7 +1471,7 @@ def _get_hashval(self):
             sorted_outputs = sorted(self.needed_outputs)
             hashobject.update(str(sorted_outputs))
             hashvalue = hashobject.hexdigest()
-            hashed_inputs['needed_outputs'] = sorted_outputs
+            hashed_inputs.append(('needed_outputs', sorted_outputs))
         return hashed_inputs, hashvalue
 
     def _save_hashfile(self, hashfile, hashed_inputs):
@@ -2136,7 +2136,7 @@ def _get_hashval(self):
             sorted_outputs = sorted(self.needed_outputs)
             hashobject.update(str(sorted_outputs))
             hashvalue = hashobject.hexdigest()
-            hashed_inputs['needed_outputs'] = sorted_outputs
+            hashed_inputs.append(('needed_outputs', sorted_outputs))
         return hashed_inputs, hashvalue
 
     @property