Skip to content

Conversation

@efiring
Copy link
Member

@efiring efiring commented Sep 30, 2016

This is the functionality added to master in 6bac790 (#6304).
Directly cherry-picking that is not possible because of the intervening
introduction of abstract base classes.

This is the functionality added to master in 6bac790 (matplotlib#6304).
Directly cherry-picking that is not possible because of the intervening
introduction of abstract base classes.
@efiring
Copy link
Member Author

efiring commented Sep 30, 2016

If and when this is merged into v2.x, it will cause a conflict when merging v2.x into master. The solution is to accept the version of animation.py from master with no changes.

@QuLogic QuLogic added this to the 2.0 (style change major release) milestone Sep 30, 2016
@NelleV
Copy link
Member

NelleV commented Oct 1, 2016

Thanks @efiring !

@NelleV NelleV merged commit 053bd76 into matplotlib:v2.x Oct 1, 2016
@efiring efiring deleted the try_animation_context_v2 branch October 1, 2016 03:27
@efiring
Copy link
Member Author

efiring commented Oct 1, 2016

I have merged v2.x into master, resolving the conflict as described earlier. 7b27a1b

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.

4 participants