Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
Backports for 2.0#7284
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Backports for 2.0#7284
Uh oh!
There was an error while loading.Please reload this page.
Conversation
Document mpl_toolkits.axes_grid1.anchored_artistsConflicts:lib/mpl_toolkits/axes_grid1/anchored_artists.pyNote that the removed imports were restored for this backport so as tonot break the API for 2.0. Whether they really should be moved or not isa matter for a different PR.
Minor cleanup work on navigation, text, and customization files.Conflicts:doc/users/navigation_toolbar.rstdoc/users/style_sheets.rstNote that (some) changes in style_sheets.rst were applited totext_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 addressesmatplotlib#596
API: default parameters of FancyArrow
…estingCI: Delete font cache in one of the configurationsConflicts:.travis.yml
…dpi-nbagg"This reverts commit9111ee2. Theindividual changelog file was already merged into the main one.
@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 |
Uh oh!
There was an error while loading.Please reload this page.
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.