Backports for 2.0 #7284
Merged
Backports for 2.0 #7284
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
Document mpl_toolkits.axes_grid1.anchored_artists Conflicts: lib/mpl_toolkits/axes_grid1/anchored_artists.py Note that the removed imports were restored for this backport so as to not break the API for 2.0. Whether they really should be moved or not is a matter for a different PR.
Minor cleanup work on navigation, text, and customization files. Conflicts: doc/users/navigation_toolbar.rst doc/users/style_sheets.rst Note that (some) changes in style_sheets.rst were applited to text_intro.rst instead as that is where the text is on 2.x.
DOC: add FAQ about np.datetime64
Fix sized delimiters for regular-sized mathtext (matplotlib#5863)
tkagg: raise each new window; partially addresses matplotlib#596
API: default parameters of FancyArrow
…esting CI: Delete font cache in one of the configurations Conflicts: .travis.yml
…dpi-nbagg" This reverts commit 9111ee2. The individual changelog file was already merged into the main one.
Merged
|
@QuLogic I looked at the merge up and it is not so bad (mostly white space conflicts). It might also help to do the merge to master in two passes, first from a commit back a bit from the current 2.x tip to catch the changes really made on 2.x and then from the current tip to catch only conflicts from the backports |
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.
These PRs were milestoned for 2.0, but were never backported. They're about 50/50 doc vs. code.
cc @jenshnielsen for #4874, @mdboom for #5204 and @tacaswell for #6879 because your PRs did not backport cleanly.
I also suggest not merging up to
masteruntil I look at it because there will be conflicts withmasterafter these last two PRs.