Skip to content
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

REF refactor algorithms misc.py #1631

Merged
merged 7 commits into from Sep 14, 2016
Merged

Conversation

berleant
Copy link
Contributor

@berleant berleant commented Sep 13, 2016

#1613

Nice-to-have pre #1628 (so it will be neater)

@berleant berleant changed the title refactor algorithms misc.py WIP refactor algorithms misc.py Sep 13, 2016
@codecov-io
Copy link

codecov-io commented Sep 13, 2016

Current coverage is 70.87% (diff: 97.79%)

Merging #1631 into master will increase coverage by <.01%

@@             master      #1631   diff @@
==========================================
  Files          1020       1019     -1   
  Lines         51240      51240          
  Methods           0          0          
  Messages          0          0          
  Branches       7259       7259          
==========================================
+ Hits          36314      36318     +4   
+ Misses        13840      13837     -3   
+ Partials       1086       1085     -1   

Powered by Codecov. Last update a746633...9248c81

@berleant berleant changed the title WIP refactor algorithms misc.py REF refactor algorithms misc.py Sep 14, 2016
@@ -35,6 +34,7 @@
BaseInterfaceInputSpec, isdefined,
DynamicTraitedSpec, Undefined)
from ..utils.filemanip import fname_presuffix, split_filename
from . import confounds
Copy link
Contributor

@oesteban oesteban Sep 14, 2016

Choose a reason for hiding this comment

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

This can be problematic. If you need some interface from confounds, please import that one interface only.

Sorry, you are right on that this is possibly the cleanest way to implement the deprecation warning.

Copy link
Member

@chrisgorgo chrisgorgo left a comment

Choose a reason for hiding this comment

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

After addressing that one little change feel free to merge it conditional on TravisCI passing (no need to wait for Circle)

"""
def __init__(self, **inputs):
super(confounds.TSNR, self).__init__(**inputs)
warnings.warn(("This interface has been deprecated since 0.12.0,"
Copy link
Member

Choose a reason for hiding this comment

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

Could we say moved instead of deprecated? "deprecated" suggest that functionality has changed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@chrisgorgo chrisgorgo merged commit 741df23 into nipy:master Sep 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants