Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

fix: closes #1920 to revert to original behavior for input names #1937

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
satra merged 5 commits into nipy:master from satra:fix/merge
Apr 5, 2017

Conversation

@satra
Copy link
Member

@satra satra commented Apr 5, 2017

No description provided.

Copy link
Member Author

satra commented Apr 5, 2017

@tclose and @effigies - would appreciate a review.

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.

Looks good. Minor comments.

no_flatten = traits.Bool(False, usedefault=True,
desc='append to outlist instead of extending in vstack mode')
ravel_inputs = traits.Bool(False, usedefault=True,
desc='ravel inputs with no_flatten is False')
Copy link
Member

@effigies effigies Apr 5, 2017

Choose a reason for hiding this comment

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

with => if/when?

if self.inputs.ravel_inputs:
out.extend(_ravel(value))
else:
out.extend(value)
Copy link
Member

@effigies effigies Apr 5, 2017

Choose a reason for hiding this comment

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

Personal preference (i.e. feel free to disregard):

if self.inputs.ravel_inputs:
 value = _ravel(value)
out.extend(value)

or

out.extend(_ravel(value) if self.inputs.ravel_inputs else value)

Copy link
Member Author

satra commented Apr 5, 2017

@effigies - i pushed a few more changes in the tests - to no longer allow hstack of unitary inputs.

Copy link
Member

effigies commented Apr 5, 2017

Sounds good. If tests pass, I'm good with this.

Copy link

Codecov Report

Merging #1937 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@ Coverage Diff @@
## master #1937 +/- ##
==========================================
+ Coverage 72.47% 72.47% +<.01% 
==========================================
 Files 1063 1063 
 Lines 54148 54153 +5 
 Branches 7811 7811 
==========================================
+ Hits 39244 39249 +5 
 Misses 13684 13684 
 Partials 1220 1220
Flag Coverage Δ
#smoketests 72.47% <100%> (ø) ⬆️
#unittests 70.02% <100%> (ø) ⬆️
Impacted Files Coverage Δ
nipype/interfaces/utility/base.py 91.01% <100%> (+0.36%) ⬆️
nipype/interfaces/utility/tests/test_base.py 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d68b929...5b44037. Read the comment docs.

1 similar comment
Copy link

codecov-io commented Apr 5, 2017
edited
Loading

Codecov Report

Merging #1937 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@ Coverage Diff @@
## master #1937 +/- ##
==========================================
+ Coverage 72.47% 72.47% +<.01% 
==========================================
 Files 1063 1063 
 Lines 54148 54153 +5 
 Branches 7811 7811 
==========================================
+ Hits 39244 39249 +5 
 Misses 13684 13684 
 Partials 1220 1220
Flag Coverage Δ
#smoketests 72.47% <100%> (ø) ⬆️
#unittests 70.02% <100%> (ø) ⬆️
Impacted Files Coverage Δ
nipype/interfaces/utility/base.py 91.01% <100%> (+0.36%) ⬆️
nipype/interfaces/utility/tests/test_base.py 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d68b929...5b44037. Read the comment docs.

@satra satra merged commit 56b2a62 into nipy:master Apr 5, 2017
@satra satra deleted the fix/merge branch October 30, 2017 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@effigies effigies effigies approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /