-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Merge 1.5 into 2x. #6187
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
Merged
Merged
Merge 1.5 into 2x. #6187
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
The string 'figure' is a valid value for dpi. Always check if this is the input, not just if we look it up from the rcparams. closes matplotlib#6113
This is now taken care of in `canvas.print_figure`.
Fix print figure dpi
DOC: clarified color argument in scatter
Fix: Pandas indexing Error in collections
FIX: plot_date ignores timezone Closes matplotlib#5575 Conflicts: lib/matplotlib/tests/test_axes.py multiple PRs added tests at same location in file keep all.
In some cases Qt may report having a negative height (and presumably width) in the case of minimizing windows / widgets. This causes issues at the Agg layer when the re-size triggers a re-draw which tries to get a renderer with a negative dimension (segfaults or OutOfMemory errors).
FIX: deal with negative canvas dimension in Qt
Boxplot stats w/ equal quartiles
Backport matplotlib#5343 from phobson/bxp-equal-quartiles
Fix: pandas series of strings Conflicts: lib/matplotlib/collections.py Manually merged changes
If PySide, PyQt4, or PyQt5 are imported do not consult rcparams or ENV variable to decide which backend to use. This is a case where ignoring user input is sensible because the Qt bindings are mutually exclusive and attempting to import a second binding will fail. This can result in stand-alone scripts / mpl embeddings which are dependent on the rcparams to function correctly. Importing a specific Qt binding is stronger signal of user intent that either of the other two configuration options and should take precedence. closes matplotlib#6164
A check was added change the fall-back behavior if the backend was not set to PyQt{4,5}, but mpl was being embedded in a larger Qt application. The previous commit handles the cases where Qt bindings are already imported earlier in the module so the check here can be removed.
This is not available in the version of nose available for py2.6.
TST: conditionally import assert_sequence_equal
Mnt qt imports
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 involved resolving a conflict so doing it this way to make sure I don't break anything