Resolve conflicts from #479 #15
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add function to compare our package version to others. We'll use this to see whether the deprecations have expired.
Add deprecation class and function that allows you to specify at which version deprecation began, and at which version deprecation will raise an error.
Check that dev version doesn't trigger error from deprecation decorator.
Replace `np.deprecate_with_doc` with `deprecate_with_version`. There are other deprecations around the code-base that could be signalled with this decorator.
It was already broken, and has been deprecated since version 1.0.
Specify version at which DeprecationWarning was first raised, and planned version for removal. Add tests for some deprecations that were not being tested.
Thanks to Chris M for reminding me.
ECAT overriding deprecated (now removed) from_filespec method in SpatialImages. Deprecate pending removal.
MRG: add routine to deprecate with from/to versions Add deprecation routine that allows you to specify at which version deprecation began, and at which version deprecation will raise an error. Add version comparison routine for our versions, to deal with extra `dev` etc strings at end of version.
|
Isn't it preferable to do a rebase? |
|
If you like. This was just fast. |
|
I think it will be less obtrusive with respect to the PR's history |
|
Sounds good. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves enh/cifti2 with nipy#479.
Also cleans up some duplicate/unused imports.