Skip to content

[FIX] Bug fixes for afni.model #2398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2018
Merged

[FIX] Bug fixes for afni.model #2398

merged 2 commits into from
Jan 26, 2018

Conversation

emdupre
Copy link
Contributor

@emdupre emdupre commented Jan 23, 2018

Changes proposed in this pull request

  • Patches cbucket output for 3dDeconvolve
  • Correctly parses output of 3dSynthesize

Patches cbucket output for 3dDeconvolve, correctly
parses output of 3dSynthesize.
@effigies
Copy link
Member

Thanks for this. I'm canceling this CI job for the moment. I'll restart it when some high priority jobs finish.

outputs['reml_script'] = self._gen_fname(
suffix='.REML_cmd', **_gen_fname_opts)
# remove out_file from outputs if x1d_stop set to True
if self.inputs.x1D_stop:
del outputs['out_file']
del outputs['out_file'], outputs['cbucket']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if I may, test_extra_Deconvolve.py could be extended to check for the removal of outputs['cbucket']

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reviewing this, @mvdoc ! It sounds like a new release is imminent, but if @effigies doesn't mind me using a circle cycle I'll submit a patch to extend the test.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emdupre nothing is building right now and won't probably merge anything more. feel free to use circle, we can always cancel.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was going to say what @djarecka said. CI is not really the submitter's problem and we can cancel and restart as needed. I just try to give a heads up when doing that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks for clarifying !

assert not 'out_file' in deconv._list_outputs()
assert not 'cbucket' in deconv._list_outputs()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The syntax x not in y is preferred to not x in y. Could you change both of these lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Patched and rebased into the previous commit!

Copy link
Member

@effigies effigies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. @mvdoc Any other issues you see?

Assuming tests pass and nobody else has concerns, will merge after the release.

@mvdoc
Copy link
Member

mvdoc commented Jan 24, 2018

LGTM 👍

@effigies effigies merged commit 2c35800 into nipy:master Jan 26, 2018
@effigies effigies added this to the 1.0.1 milestone Feb 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants