Merge 15x to 2x #5934
Merged
Merge 15x to 2x #5934
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
Fixes link checker issue in documentation
DOC: Fix issue with Sphinx 1.3.4 Discarded changes to .travis.yml from matplotlib#5872
Remove reference to changelog from frontpage
mathtext: Fix bugs in conversion of apostrophes to primes
…tion DOC: add function name to deprecation warning
Fix reading/writing from urllib.request objects This backport needed to exclude nbagg optimizations.
Merge pull request matplotlib#5910 from mdboom/image-read-from-url
FIX: quiver key pivot location
Backport Merge pull request matplotlib#5620 from tacaswell/fix_quiverkey
| @@ -1580,5 +1582,5 @@ def kwdoc(a): | |||
|
|
|||
| docstring.interpd.update(Artist=kwdoc(Artist)) | |||
|
|
|||
| _get_axes_msg = """This has been deprecated in mpl 1.5, please use the | |||
| _get_axes_msg = """{} has been deprecated in mpl 1.5, please use the | |||
There was a problem hiding this comment.
Just checking, was this brace formatting used in v1.5.x?
There was a problem hiding this comment.
Yes. This is a merge of 1.5.x to 2.x
There was a problem hiding this comment.
Right, so the point is that '{}' can't be used in v1.5.x branch. Same thing with my comment about the backport I just merged into 1.5.x.
|
I'll put together a PR that fixes the formatting stuff in v1.5.x. |
|
@WeatherGod Thanks, sorry for missing that |
|
The fix for them is in #5935. |
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.
this turned out to be more painful than usual because both branches modified the test images for mathtext 31. I have regenerated these here.