/matplotlib

Merge 2x into master #6188

Merged
merged 31 commits into from Mar 19, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.1 (next point r...
4 participants
@jenshnielsen @mdboom @tacaswell @QuLogic
@jenshnielsen
Owner

jenshnielsen commented Mar 19, 2016

Again with a conflict

tacaswell and others added some commits Mar 6, 2016

@tacaswell tacaswell FIX: always normalize dpi 
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 #6113
 259483a
@tacaswell tacaswell MNT: remove redundant normalization 
This is now taken care of in `canvas.print_figure`.
a175e95
@jenshnielsen jenshnielsen Merge pull request #6114 from tacaswell/fix_print_figure_dpi 
Fix print figure dpi
637c3da
@jenshnielsen jenshnielsen Fix clang warning by using fabs to compare floats 941406e
@jenshnielsen jenshnielsen Fix clang formatter warnings. These are long ints so format as such eab5a9a
@jenshnielsen jenshnielsen Use Numpy macros for formatting 
Should ensure correct formatting in both 32 and 64 bit
 0c0b5df
@jenshnielsen jenshnielsen Enable the use of c99 macros in c++
3818675
@tacaswell tacaswell MNT: clean up example 
 - remove leading space to tighten up words
 - reduce font size a bit
c0134ea
@tacaswell tacaswell Merge pull request #6140 from kylerbrown/scatter-doc2 
DOC: clarified color argument in scatter
eadeb1a
@tacaswell tacaswell Merge pull request #6148 from has2k1/fix-pandas-indexing 
Fix: Pandas indexing Error in collections
1d7f0d9
@tacaswell tacaswell Merge pull request #6091 from KyleBsingh/master 
FIX: plot_date ignores timezone

Closes #5575

Conflicts:
	lib/matplotlib/tests/test_axes.py

	   multiple PRs added tests at same location in file
	   keep all.
44afc73
@tacaswell tacaswell FIX: deal with negative canvas dimension in Qt 
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).
1540c98
@jenshnielsen jenshnielsen Merge pull request #6152 from tacaswell/fix_qt_segfault 
FIX: deal with negative canvas dimension in Qt
cd88b31
@jenshnielsen @jenshnielsen jenshnielsen Merge pull request #5343 from phobson/bxp-equal-quartiles 
Boxplot stats w/ equal quartiles
54ec43f
@jenshnielsen jenshnielsen Merge pull request #6153 from jenshnielsen/backport_5343 
Backport #5343 from phobson/bxp-equal-quartiles
7266b4f
@tacaswell tacaswell Merge pull request #6156 from madphysicist/patch-1 
Bug: Fixed regression of `drawstyle=None`
2b20939
@mdboom mdboom Merge pull request #6128 from tacaswell/doc_fix_rainbow_example 
MNT: clean up example
bf22bf3
@mdboom mdboom Merge pull request #6052 from jenshnielsen/cleanup-clang-warnings 
Cleanup clang warnings
c9c8b8a
@tacaswell tacaswell Merge pull request #6158 from has2k1/fix-pandas-iterables 
Fix: pandas series of strings
Conflicts:
	lib/matplotlib/collections.py
	  Manually merged changes
c78ca18
@tacaswell tacaswell MNT: check PySide, PyQt4, or PyQt5 are imported 
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 #6164
 7f5ae1f
@tacaswell tacaswell MNT: simplify fallback Qt behavior 
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.
f43a30d
@tacaswell tacaswell TST: conditionally import assert_sequence_equal 
This is not available in the version of nose available for py2.6.
a0c9759
@tacaswell tacaswell Merge pull request #6177 from tacaswell/tst_fix26_compat 
TST: conditionally import assert_sequence_equal
41007a5
@jenshnielsen jenshnielsen Merge pull request #6174 from tacaswell/mnt_qt_imports 
Mnt qt imports
0853446
@jenshnielsen jenshnielsen Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
35a1cc8
@jenshnielsen jenshnielsen Merge pull request #6187 from jenshnielsen/merge152x 
Merge 1.5  into 2x.
d7c478b

mdboom added the needs_review label Mar 19, 2016

jenshnielsen referenced this pull request Mar 19, 2016

Merged

Revert part of #6052 #6189

jenshnielsen added some commits Mar 19, 2016

@jenshnielsen jenshnielsen Merge pull request #6189 from jenshnielsen/revertclangcleanup 
Revert part of #6052
5266fea
@jenshnielsen jenshnielsen Merge remote-tracking branch 'matplotlib/v2.x' into merge2xmaster2

All checks have passed

2 successful checks
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
2982b85

@tacaswell tacaswell added a commit that referenced this pull request Mar 19, 2016

@tacaswell tacaswell Merge pull request #6188 from jenshnielsen/merge2xmaster2 
Merge 2x into master
 8e72859

@tacaswell tacaswell merged commit 8e72859 into matplotlib:master Mar 19, 2016
2 checks passed

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

tacaswell removed the needs_review label Mar 19, 2016

jenshnielsen deleted the jenshnielsen:merge2xmaster2 branch Mar 19, 2016

QuLogic added this to the 2.1 (next point release) milestone Mar 20, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment