Merge 2.x to master #7026
Merged
Merge 2.x to master #7026
Conversation
This file contains 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
This is something that we probably want to expose as a knob without forcing full classic mode. Closes matplotlib#6998
Both set to {'lines.dotted_pattern': [1.1, 1.1]}
Doc v2 release notes
|
I merged |
|
Yes, I misinterpreted the situation. I will re-kill style_sheets.rst. |
|
Two failures: a sphinx problem in an old whats_new in the docs, and one svg image comparison failure in the pytest build (/home/travis/build/matplotlib/matplotlib/result_images/test_mplot3d/mixedsubplot.svg). |
|
I have fixed the reference and re-started the pytest run (that smelled like a transient to me). If the svg failure is transient I will push this + my extra commit to fix the ref directly to master. |
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 3 conflicts, so I am using a PR for this merge to allow more checking.