Merge up 30x #14254
Merged
Merge up 30x #14254
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
…t-of-pr-12790-on-v3.0.x Backport PR matplotlib#12790 on branch v3.0.x (Remove ticks and titles from tight bbox tests.)
Pin pytest to <3.8 (for 3.0.x)
…-12824-on-v3.0.x Backport PR matplotlib#12824 on branch v3.0.x
…t-of-pr-12795-on-v3.0.x Backport PR matplotlib#12795 on branch v3.0.x (Fix Bezier degree elevation formula in backend_cairo.)
…t-of-pr-12890-on-v3.0.x Backport PR matplotlib#12890 on branch v3.0.x (Restrict postscript title to ascii.)
…t-of-pr-12848-on-v3.0.x Backport PR matplotlib#12848 on branch v3.0.x (Fix spelling of the name Randall Munroe)
…-12774-on-v3.0.x Backport PR matplotlib#12774 on branch v3.0.x
…t-of-pr-12921-on-v3.0.x Backport PR matplotlib#12921 on branch v3.0.x (Fix documentation of vert parameter of Axes.bxp)
…-12914-on-v3.0.x Backport PR matplotlib#12914 on branch 3.0.x: Fix numpydoc formatting
…t-of-pr-12938-on-v3.0.x Backport PR matplotlib#12938 on branch v3.0.x (Fix xtick.minor.visible only acting on the xaxis)
…t pygtk is installed
…t-of-pr-12929-on-v3.0.x Backport PR matplotlib#12929 on branch v3.0.x (FIX: skip gtk backend if gobject but not pygtk is installed)
…t-of-pr-13469-on-v3.0.2-doc Backport PR matplotlib#13469 on branch v3.0.2-doc (Add explanatory comments for text rotation example)
…t-of-pr-13469-on-v3.0.x Backport PR matplotlib#13469 on branch v3.0.x (Add explanatory comments for text rotation example)
Pyplot doesn't recognise xkcd Script from https://github.com/ipython/xkcd-font since the font family is 'xkcd Script' and not just 'xkcd'. Added font to list of xkcd fonts.
Add font to pyplot.xkcd()
Conflicts:
.appveyor.yml
- kept version from this branch
doc/api/api_changes.rst
- kept version from this branch, due to moving text around
requirements/testing/travis_all.txt
- kept version from this branch
The third and last planned bug-fix release of the 3.0 series * fix several possible memory leaks * documentation fixes jquery-ui is no longer bundled in git repo and is downloaded during the install or sdist process. If you are installing from pypi the files will be included, but if you are installing from git you will need internet access the first time you run `pip install .`. The install process tries to cache the files and will not need internet access on future installations.
DOC: add banner for 2019 JHEPC
Resolved all conflicts in favor of 3.1.x branch. This brings in changes that were put directly on the 3.0.x branch: - citing change - 3.0.2 gh stats - a bug-fix for xkcd mode - bug-fix for gh-stats tool
|
When this is merged we can also delete the v3.0.x and v3.0.3-doc branches. |
QuLogic
approved these changes
May 18, 2019
|
Going to self-merge this to make sure we don't collect confilts. I don't really want to re-do sorting out the conflicts on this.... |
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.
Should have done this before tagging 3.1.0 .
After this is merged will have to do the 3.1.x -> master merge again.