Backport axes grid work #11813
Merged
Backport axes grid work #11813
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
Clean docstring of CountourSet
Improve docstring of contour
Conflicts:
lib/matplotlib/contour.py
- conflict due to de-py2-ification
- docstring conflicts, kept the version from master branch
Improve Figure docstrings
Conflicts:
lib/matplotlib/figure.py
- kept master version of docstring in 2 cases
…rrect-axesgrid1-doc
DOC: Resurrecting axes_grid1 documentation
Conflicts:
lib/matplotlib/figure.py
- kept master branch version of a docstring
lib/mpl_toolkits/axes_grid1/colorbar.py
- conflicts around __future__ import
lib/mpl_toolkits/axisartist/axis_artist.py
- conflicts around __future__ import
Fixes png showing inconsistent inset_axes position
Conflicts:
lib/mpl_toolkits/axes_grid1/inset_locator.py
- keep non-superified version
…inset_axes
Fix inset_axes + doc
Conflicts:
examples/axes_grid1/inset_locator_demo.py
- kept master branch version
examples/axes_grid1/inset_locator_demo2.py
- kept master branch version
lib/mpl_toolkits/axes_grid1/inset_locator.py
- conflicts around __future__ import
phobson
approved these changes
Aug 6, 2018
ImportanceOfBeingErnest
approved these changes
Aug 6, 2018
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 is primarily to backport #11079 and #11060
The other PRs backported (#11090, #10595, #10756) are to greatly reduce the conflicts as part of the cherry-picking.
attn @ImportanceOfBeingErnest