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

Skip to content

Merge from v2.x #7417

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 14 commits into from
Nov 6, 2016
Merged

Merge from v2.x #7417

merged 14 commits into from
Nov 6, 2016

Conversation

efiring
Copy link
Member

@efiring 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 14 commits November 1, 2016 14:31
@NelleV
Merge pull request matplotlib#7370 from jni/spines-rc-template
4ea9892 
Add example use of axes.spines.SIDE prop in matplotlibrc
@ivanov
Merge pull request matplotlib#7236 from NelleV/enh_contributing_guide…
28f4b6e 
…lines

ENH Improving the contribution guidelines
@efiring
Merge pull request matplotlib#7384 from JunTan/7198
6695009 
change hardcopy.docstring to docstring.hardcopy
@mdboom @tacaswell
Merge pull request matplotlib#5236 from tacaswell/doc_tweak_readme
faf4894 
DOC: tweak README formatting
@tacaswell
Merge pull request matplotlib#5349 from gitter-badger/gitter-badge
320be9e 
Add a Gitter chat badge to README.rst
@tacaswell
Merge pull request matplotlib#7381 from matplotlib/readme-updates
1a6a897 
DOC: Updating the readme
Conflicts:
	README.rst
	   Whitespace changes
@dopplershift
ENH: Improve barbs() error message for badly-sized arrays.
b915ae1 
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.
@dopplershift
MNT: Fix docstring typo.
65d818d
@NelleV
Merge pull request matplotlib#7407 from dopplershift/barbs-error
dc13688 
Improve barbs() error message
@NelleV
Merge pull request matplotlib#7398 from wgma00/master
263e675 
Moved python files from doc/pyplots to examples folder
@efiring
BUG: fix autoscale_view with log scale and margins
2edf1e3 
LogLocator.view_limits was always clipping vmin to minpos;
now it sets vmin to minpos only if vmin <= 0.
@efiring
Fix all the baseline images that were bad because of the bug
1ae616e
@NelleV
Merge pull request matplotlib#7410 from efiring/log_locator_vmin
cb21ba7 
BUG: fix autoscale_view with log scale and margins
@efiring
Merge remote-tracking branch 'upstream/v2.x' into merge_from_v2.x
939a670 
Conflicts:
	lib/matplotlib/tests/test_axes.py
	lib/matplotlib/tests/test_quiver.py
Resolved by adding new tests from v2.x.
@efiring efiring merged commit 4eaf3a6 into matplotlib:master Nov 6, 2016
@efiring efiring deleted the merge_from_v2.x branch November 6, 2016 02:26
@efiring
Copy link
Member Author

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 QuLogic added this to the 2.1 (next point release) milestone Nov 6, 2016
@QuLogic
Copy link
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
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.1
Development

Successfully merging this pull request may close these issues.
7 participants
@efiring @QuLogic @NelleV @ivanov @mdboom @tacaswell @dopplershift