Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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 17 commits into from
Mar 19, 2016
Merged

Merge 1.5 into 2x. #6187

merged 17 commits into from
Mar 19, 2016

Conversation

jenshnielsen
Copy link
Member

This involved resolving a conflict so doing it this way to make sure I don't break anything

tacaswell and others added 17 commits March 5, 2016 20:24
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`.
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
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
jenshnielsen added a commit that referenced this pull request Mar 19, 2016
@jenshnielsen jenshnielsen merged commit d7c478b into matplotlib:v2.x Mar 19, 2016
@QuLogic QuLogic added this to the 2.0 (style change major release) milestone Mar 20, 2016
@jenshnielsen jenshnielsen deleted the merge152x branch April 2, 2016 11:07
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.

4 participants