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

Mrg animation merge #7622

Merged
merged 29 commits into from
Dec 13, 2016
Merged

Mrg animation merge #7622

merged 29 commits into from
Dec 13, 2016

Conversation

tacaswell
Copy link
Member

Messy merge from 2.x into master, running through PR to let CI have a crack at it.

Plan to self-merge if it passes and no one beats me to it.

tacaswell and others added 29 commits December 7, 2016 22:51
 - always try to call `finish` even if an exception is raised.
 - return `self` so that

    with writer.saving(...) as mv:
        mv.grab_frame()

   works as expected.
Closes matplotlib#7595, matplotlib#7493, matplotlib#7587.
Bbox._minpos is now initialized to [np.inf, np.inf] instead of
[1e-7, 1e-7].
Old code with a colorbar in which the formatter is set to
a LogFormatter and a SymlogNorm is used now works again (although
the results are better in 2.0 if the colorbar is left to handle
the formatter automatically).
LogLocator now has its own nonsingular() method which provides
a reasonable starting point for a log axis when no data have
been plotted.
BUG: fix minpos handling and other log ticker problems
This bakes into the text artist (via the FontProperties) the default
fontsize at the time of creation.
…oviewriter_saving_cm

MNT: tweak MovieWriter.saving to be more cautious
This appears to already be the case for all of these properties, but
remove the rcparams lookup from the get_* methods just to be sure.
`None` used to be a valid value for the style/slant and variant,
however in cc61700 the behavior was
changed to look up the defaults as set time (not get time) so there is
no reason to allow invalid values to be set to the internal state.
…t_creation_time

API: convert string fontsize to points immediately
 Conflicts:
	lib/matplotlib/animation.py
	   - had to merge documentation changes with an ABC being
             pulled out the top of MovieWriter
	lib/matplotlib/font_manager.py
	   - whitespace conflicts
@QuLogic QuLogic added this to the 2.1 (next point release) milestone Dec 13, 2016
@codecov-io
Copy link

Current coverage is 62.01% (diff: 85.32%)

Merging #7622 into master will increase coverage by 0.01%

@@             master      #7622   diff @@
==========================================
  Files           174        174          
  Lines         56056      56046    -10   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits          34754      34759     +5   
+ Misses        21302      21287    -15   
  Partials          0          0          

Powered by Codecov. Last update e26db3a...bbe4fd8

@QuLogic QuLogic merged commit 424d3b0 into matplotlib:master Dec 13, 2016
@tacaswell tacaswell deleted the mrg_animation_merge branch December 13, 2016 04:34
@tacaswell
Copy link
Member Author

Thanks @QuLogic

@QuLogic
Copy link
Member

QuLogic commented Dec 14, 2016

Well, I did ask for it. 😉

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.

5 participants