/matplotlib

Merge from v2.x #7417

Merged
merged 14 commits into from Nov 6, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.1 (next point r...
7 participants
@efiring @QuLogic @NelleV @ivanov @mdboom @tacaswell @dopplershift
@efiring
Owner

efiring commented Nov 6, 2016

There were a couple of conflicts, so I want to make sure the tests still pass.

NelleV and others added some commits Nov 1, 2016

@NelleV NelleV Merge pull request #7370 from jni/spines-rc-template 
Add example use of axes.spines.SIDE prop in matplotlibrc
4ea9892
@ivanov @ivanov ivanov Merge pull request #7236 from NelleV/enh_contributing_guidelines 
ENH Improving the contribution guidelines
28f4b6e
@efiring efiring Merge pull request #7384 from JunTan/7198 
change hardcopy.docstring to docstring.hardcopy
6695009
@mdboom @tacaswell mdboom Merge pull request #5236 from tacaswell/doc_tweak_readme 
DOC: tweak README formatting
 faf4894
@tacaswell tacaswell Merge pull request #5349 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.rst
 320be9e
@tacaswell tacaswell Merge pull request #7381 from matplotlib/readme-updates 
DOC: Updating the readme
Conflicts:
	README.rst
	   Whitespace changes
1a6a897
@dopplershift dopplershift ENH: Improve barbs() error message for badly-sized arrays. 
With this change, when given masked arrays with incompatible sizes,
barbs() will raise a ValueError with a message stating as much.
Previously, it would error with a TypeError that did not make it clear
at all the source of the problem.
This commit was signed with a verified signature.
@dopplershift dopplershift Ryan May
GPG key ID: 33BF97C62E8ACC62 Learn about signing commits
b915ae1
@dopplershift dopplershift MNT: Fix docstring typo.
This commit was signed with a verified signature.
@dopplershift dopplershift Ryan May
GPG key ID: 33BF97C62E8ACC62 Learn about signing commits
65d818d
@NelleV NelleV Merge pull request #7407 from dopplershift/barbs-error 
Improve barbs() error message
dc13688
@NelleV NelleV Merge pull request #7398 from wgma00/master 
Moved python files from doc/pyplots to examples folder
263e675
@efiring efiring BUG: fix autoscale_view with log scale and margins 
LogLocator.view_limits was always clipping vmin to minpos;
now it sets vmin to minpos only if vmin <= 0.
2edf1e3
@efiring efiring Fix all the baseline images that were bad because of the bug
1ae616e
@NelleV NelleV Merge pull request #7410 from efiring/log_locator_vmin 
BUG: fix autoscale_view with log scale and margins
cb21ba7
@efiring efiring Merge remote-tracking branch 'upstream/v2.x' into merge_from_v2.x 
Conflicts:
	lib/matplotlib/tests/test_axes.py
	lib/matplotlib/tests/test_quiver.py
Resolved by adding new tests from v2.x.

Some checks were not successful

1 errored and 2 successful checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage increased (+0.003%) to 61.827%
Details
939a670

@efiring efiring merged commit 4eaf3a6 into matplotlib:master Nov 6, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.003%) to 61.827%
Details

efiring deleted the efiring:merge_from_v2.x branch Nov 6, 2016

@efiring
Owner

efiring commented Nov 6, 2016

The mysteries of the tests never cease. Everything passed on this PR. When I merged it, all tests passed except for the one run with pytest, which generated the following:

=================================== FAILURES ===================================

____________________ test_mixedsubplots[0-mixedsubplot-svg] ____________________

expected = '/home/travis/build/matplotlib/matplotlib/result_images/test_mplot3d/mixedsubplot-expected.svg'

actual = '/home/travis/build/matplotlib/matplotlib/result_images/test_mplot3d/mixedsubplot.svg'

tol = 0

    def raise_on_image_difference(expected, actual, tol):

        __tracebackhide__ = True



        err = compare_images(expected, actual, tol, in_decorator=True)



        if not os.path.exists(expected):

            raise ImageComparisonFailure('image does not exist: %s' % expected)



        if err:

            raise ImageComparisonFailure(

                'images not close: %(actual)s vs. %(expected)s '

>               '(RMS %(rms).3f)' % err)

E           matplotlib.testing.exceptions.ImageComparisonFailure: images not close: /home/travis/build/matplotlib/matplotlib/result_images/test_mplot3d/mixedsubplot_svg.png vs. /home/travis/build/matplotlib/matplotlib/result_images/test_mplot3d/mixedsubplot-expected_svg.png (RMS 0.104)

lib/matplotlib/testing/decorators.py:216: ImageComparisonFailure

== 1 failed, 6172 passed, 8 skipped, 27 xfailed, 3 xpassed in 1124.92 seconds ==

QuLogic added this to the 2.1 (next point release) milestone Nov 6, 2016

@QuLogic
Member

QuLogic commented Nov 7, 2016

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