From b8f30d2da9ab02329d30b49b528736ef93e24cc7 Mon Sep 17 00:00:00 2001 From: oesteban Date: Thu, 22 Nov 2018 00:02:44 -0800 Subject: [PATCH 1/2] [MAINT] DeprecationWarning: use ``HasTraits.trait_set`` instead Fix this warning that is populating logs lately. --- nipype/pipeline/engine/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nipype/pipeline/engine/utils.py b/nipype/pipeline/engine/utils.py index 672e482959..7383910986 100644 --- a/nipype/pipeline/engine/utils.py +++ b/nipype/pipeline/engine/utils.py @@ -304,13 +304,13 @@ def save_resultfile(result, cwd, name): tosave = _uncollapse(outputs.copy(), collapsed) except AttributeError: tosave = outputs = result.outputs.dictcopy() # outputs was a bunch - result.outputs.set(**modify_paths(tosave, relative=True, basedir=cwd)) + result.outputs.trait_set(**modify_paths(tosave, relative=True, basedir=cwd)) savepkl(resultsfile, result) logger.debug('saved results in %s', resultsfile) if result.outputs: - result.outputs.set(**outputs) + result.outputs.trait_set(**outputs) def load_resultfile(path, name): @@ -360,7 +360,7 @@ def load_resultfile(path, name): except AttributeError: outputs = result.outputs.dictcopy() # outputs == Bunch try: - result.outputs.set( + result.outputs.trait_set( **modify_paths(outputs, relative=False, basedir=path)) except FileNotFoundError: logger.debug('conversion to full path results in ' From aad991d7ac86e1138cd2990bc374fb57ab332bbb Mon Sep 17 00:00:00 2001 From: oesteban Date: Thu, 22 Nov 2018 09:16:30 -0800 Subject: [PATCH 2/2] fixed --- nipype/pipeline/engine/utils.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nipype/pipeline/engine/utils.py b/nipype/pipeline/engine/utils.py index 7383910986..7df4fa15ca 100644 --- a/nipype/pipeline/engine/utils.py +++ b/nipype/pipeline/engine/utils.py @@ -304,13 +304,15 @@ def save_resultfile(result, cwd, name): tosave = _uncollapse(outputs.copy(), collapsed) except AttributeError: tosave = outputs = result.outputs.dictcopy() # outputs was a bunch - result.outputs.trait_set(**modify_paths(tosave, relative=True, basedir=cwd)) + for k, v in list(modify_paths(tosave, relative=True, basedir=cwd).items()): + setattr(result.outputs, k, v) savepkl(resultsfile, result) logger.debug('saved results in %s', resultsfile) if result.outputs: - result.outputs.trait_set(**outputs) + for k, v in list(outputs.items()): + setattr(result.outputs, k, v) def load_resultfile(path, name): @@ -360,8 +362,9 @@ def load_resultfile(path, name): except AttributeError: outputs = result.outputs.dictcopy() # outputs == Bunch try: - result.outputs.trait_set( - **modify_paths(outputs, relative=False, basedir=path)) + for k, v in list(modify_paths(outputs, relative=False, + basedir=path).items()): + setattr(result.outputs, k, v) except FileNotFoundError: logger.debug('conversion to full path results in ' 'non existent file')