Merge from v2.x #6431
Merged
Merge from v2.x #6431
Conversation
This file contains 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
The 'left' and 'right' sliders are both created at 0 and then updated to the values read out of the figure. There is logic in the callback functions to separate singular inputs and a second set of callback functions to ensure that the min/max stay in the right order. What was happening is: - both left and right are 0 - set left to the value from the figure - constraint callback fires and sets the minimum of right to be equal to the current value of left. Qt helpfully adjust the value of the slider from 0 -> the left value (as 0 is now no longer an allowed value) - the callback to adjust the figure fires, notes that the left and right values are the same and makes the input value a bit smaller - propagates that value back to the figure. The solution is to set the values of each slider before connecting up the callback. closes matplotlib#6121
Block pyparsing 2.1.2 which is broken on python3.4
Extends cbb3dc8 to also apply to minor ticks closes matplotlib#6408
…pect_tick_rcparams FIX: apply tick.side rcparam to major&minor ticks
…pagation MNT: key events handler return value to True to stop propagation it gtk
API: Use xkcd: prefix to avoid color name clashes.
…alog CLN: removing unused DialogLineprops from gtk3
API: ticker.LinearLocator view_limits algorithm changes closes matplotlib#6142
PRF: change draw -> draw_idle
…_loop Fix infinite ticker loop
BUG: copy image data so it can't be modified prior to drawing
The lack of this scale is pointed out in matplotlib#6365 and was the big difference between pandas AutoDateFormatter and the stock upstream version.
Closes matplotlib#6270 Also removes an unused argument from the _autolev method.
BUG: fix contour zmin, zmax types to work with LinearLocator
…plit_points ENH: add musecond scale to AutoDateFormatter
Instead of a hard-coded look for either instance types or strings, make it a property of the MovieWriter instances. Set the flag to true by default for the MovieFileWriters (which all seem to work fine) and make it false by default for MovieWriters (which are currently pipe-based and break). We can also eliminate looking at strings by doing the check after we create the instance of MovieWriter (if necessary).
This fixes part of matplotlib#6416 by resetting the 'savefig.bbox' rcParam if it is set to 'tight'.
FIX: animation confusion
Merge from 1.5
|
@tacaswell or @jenshnielsen Only appveyor is running on this--no Travis. I imagine this means I broke .travis.yml, but I don't see what the problem is. |
| # Install only from travis wheelhouse | ||
| wheelhouse_pip_install $NUMPY $PANDAS; | ||
| # Install only from travis wheelhouse | ||
| - if [ -z "$PRE" ]; then |
There was a problem hiding this comment.
The pipe on the first line is necessary here to get proper multi-line semantics.
There was a problem hiding this comment.
Thank you--I completely missed that. I will put it in now.
|
@dopplershift, I had to add |
|
@efiring I think |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This merge from v2.x into master also required a little editing, and it involves many changes, hence this PR. I resolved conflicts in .travis.yml and lib/matplotlib/tests/test_colors.py.