Merge v2.0.x into master #8383
Merged
Merge v2.0.x into master #8383
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
I've tried this out on the first ~2000 characters (though not all are available in DejaVu Sans), and it doesn't seem to break anything. Fixes matplotlib#7227.
Named Matplotlib module in windows instructions
The event location is in logical pixels, which is the way it should stay for the rest of the stack.
Regenerate the gitwash docs.
DOC: Add a code block in 'installing' docs.
Fixes typos in Artist tutorial
DOC: Fixed x, y, docstring in errorbar
Addresses matplotlib#8177, Readme badges
TST afm._to_str is now tested against utf8-encoded bytes
Fixed bug in path interaction code where multiple moves in a row (which correspond to isolated points surrounded by nans after they have been filtered from the path) would be discarded which resulted in points not being plotted. closes matplotlib#7293
FIX: do not skip isolated points in vector outputs
Correctly close glyph contours that use curves.
Qt5: Fix event positions on HiDPI screens.
Small tweaks to API documentation on scaling dashes
These colormaps were deprecated with 2.0.1 (and never supposed to be in 2.0.0 in the first place.) Using them causes (non-fatal) warnings when building documentation.
…anges DOC: missing API docs from matplotlib#8032
Skip more deprecated colormaps in example.
FIX: always decode bytes as utf-8 in AFM headers
The shim was put in place because the thinking was changing the default fonts would eliminate the need. That's not the case, as that prevents other font changes from being reflected when mathtext is used.
BUG: Remove mathtext default shim for ticker (Fixes matplotlib#8017)
…ec_tutorial DOC: Fix typos in gridspec tutorial
DOC: Clean up the pie docstring PR
Use neutral pronoun in docs.
…inx-entry Add autoclass entry for Artist API doc.
Adding headers for examples/units for MEP12/sphinx-gallery compliance
Mep12 ticks and spines
Mep12 showcase
…_dot Early check for dot binary (from graphviz) when building the doc (fixes matplotlib#8207)
Make ArrowStyle docstrings numpydoc compatible
…path_on_freebsd Use XDG config path on FreeBSD
Fix check for DISPLAY on PyQt5.
…8141 Issue matplotlib#8141: Dash validator allowing None values in addition to floats
BUG Ignore invisible axes in computing tight_layout
FIX: add __setstate__ function
Don't index into __builtins__ (not supported by PyPy).
symlog + minor ticks = exception
|
OK, I see in Travis' log that it created the build for this PR, but it doesn't seem to exist. |
|
https://travis-ci.org/matplotlib/matplotlib/builds/215421660 ? (I've restarted the flaky builds on that job) |
|
Hmm, looks like |
|
I can't seem to load that job. Anyway, I think in this case I updated the png and forgot about the other extensions because they all passed for me. For some reason that test is slightly different on |
Conflicts: INSTALL README.rst lib/matplotlib/__init__.py lib/matplotlib/axes/_axes.py lib/matplotlib/tests/baseline_images/test_patheffects/collection.pdf lib/matplotlib/tests/baseline_images/test_patheffects/collection.png lib/matplotlib/tests/baseline_images/test_patheffects/collection.svg lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.svg lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_coding_standards.py lib/matplotlib/tests/test_patheffects.py lib/matplotlib/tests/test_ticker.py
|
Sigh, now that I'm running the middle of Monday, I need to wait for macOS builders again. If this passes, I'm going to push directly; no need for an extra merge commit. |
phobson
approved these changes
Mar 27, 2017
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.
There were some conflicts in some tests that I added, plus some documentation stuff.