Merge v2.2.x #11818
Merged
Merge v2.2.x #11818
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
…pr-10981 Backport PR matplotlib#10981 on branch v2.2.x
…) example in order to fit margin…
…pr-11149 Backport PR matplotlib#11149 on branch v2.2.2-doc
…igin* and *extent*
…pr-10947 Backport PR matplotlib#10947 on branch v2.2.2-doc
…pr-11161 Backport PR matplotlib#11161 on branch v2.2.x
…ontest DOC: add plotting contest banner
…hip_ad DOC: remove fellowship advertisement
…pr-11169 Backport PR matplotlib#11169 on branch v2.2.2-doc
Manual backport matplotlib#11035
…pr-11180 Backport PR matplotlib#11180 on branch v2.2.2-doc
…pr-11186 Backport PR matplotlib#11186 on branch v2.2.2-doc
…pr-11063 Backport PR matplotlib#11063 on branch v2.2.2-doc
…pr-11221 Backport PR matplotlib#11221 on branch v2.2.2-doc
…pr-11189 Backport PR matplotlib#11189 on branch v2.2.x
…pr-11286-on-v2.2.2-doc Backport PR matplotlib#11286 on branch v2.2.2-doc
Backport: Pull Request matplotlib#11330: FIX: Don't let constrained_layout counter overflow
Rewrite and greatly simplify qt_compat.py.
Conflicts:
INSTALL.rst
- kept changes away from App specific wording
- kept min pyqt4 version bump
doc/sphinxext/mock_gui_toolkits.py
- only removed setting up the Qt mocks
lib/matplotlib/backends/qt_compat.py
- kept backported version, conflict was in block of
constants at top (all of the contestants are still
defined in the module)
…rm-limits
FIX: image respect norm limits w/ None
Conflicts:
lib/matplotlib/image.py
- keep changes backported from master. Looks like conflict
was due to some white-space clean up done on master.
Add note about hist2d resetting axis limits
Conflicts:
lib/matplotlib/axes/_axes.py
- kept master branch version of docstrings
Propagate marker antialias setting to GraphicsContext.
…-alpha
FIX: When drawing markers, don't set the GraphicsContext alpha.
Conflicts:
lib/matplotlib/lines.py
- keep aliases (which are implemented automatically on
master) explicitly in code
Use dummy_threading if threading not available
Conflicts:
lib/matplotlib/backends/backend_agg.py
- conflicts due to removing __future__ / six on master
This also backported parts of other PRs making changes to the docs.
Replace :ref:`sphx_glr_...` by :doc:`/...`.
Conflicts:
examples/color/color_cycler.py
- deleted, not present on 2.2.x
examples/axes_grid1/simple_anchored_artists.py
examples/images_contours_and_fields/contour_image.py
examples/images_contours_and_fields/quiver_demo.py
examples/images_contours_and_fields/quiver_simple_demo.py
examples/misc/anchored_artists.py
- keep master version
…strings-with-escape
Use raw string literals for docstrings with escapes
Conflicts:
lib/matplotlib/artist.py
- reject py2 incompatible changes
lib/matplotlib/axes/_axes.py
- also backports some documentation changes
FIX: Properly position markers in step plots.
Conflicts:
lib/matplotlib/tests/test_lines.py
- conflict due to adding imports around (removed on master)
__future__ and six
DOC: Use plt.subplots()
Conflicts:
lib/matplotlib/tests/test_backends_interactive.py
- only backported the minimal change
tutorials/advanced/transforms_tutorial.py
- only backported the minimal change
tutorials/text/pgf.py
- only backported the minimal change
DOC: warn if user is using constrained layout and uses subplots_adjust
Conflicts:
lib/matplotlib/figure.py
- signature on master has changed to explicit kwargs,
conflict due to that change.
This context manager was added to master in 690b213 via matplotlib#10314. We do not want to backport that entire commit, however the backport of matplotlib#11407 requires this context manger. It is private and self contained to low-risk to backport
backports to prep for 2.2.3
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
…_work Backport axes grid work
Conflicts: .travis.yml INSTALL.rst doc/_static/mpl.css doc/api/api_changes.rst doc/api/index.rst doc/api/pyplot_summary.rst doc/conf.py doc/contents.rst doc/faq/howto_faq.rst doc/sphinxext/mock_gui_toolkits.py doc/users/prev_whats_new/whats_new_1.1.rst examples/axes_grid1/inset_locator_demo.py examples/color/color_cycler.py examples/images_contours_and_fields/contour_demo.py examples/images_contours_and_fields/contourf_demo.py lib/matplotlib/_constrained_layout.py lib/matplotlib/axes/_axes.py lib/matplotlib/axes/_base.py lib/matplotlib/backends/backend_agg.py lib/matplotlib/backends/qt_compat.py lib/matplotlib/cbook/__init__.py lib/matplotlib/contour.py lib/matplotlib/figure.py lib/matplotlib/font_manager.py lib/matplotlib/lines.py lib/matplotlib/pyplot.py lib/matplotlib/sphinxext/plot_directive.py lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_backends_interactive.py lib/matplotlib/tests/test_figure.py lib/matplotlib/tests/test_image.py lib/matplotlib/tests/test_lines.py lib/matplotlib/tests/test_pyplot.py lib/matplotlib/tests/test_tightlayout.py lib/mpl_toolkits/axes_grid1/colorbar.py lib/mpl_toolkits/axes_grid1/inset_locator.py lib/mpl_toolkits/tests/test_axes_grid1.py setupext.py tutorials/advanced/transforms_tutorial.py tutorials/intermediate/constrainedlayout_guide.py tutorials/intermediate/imshow_extent.py In all cases kept the master branch version of conflicted file.
tacaswell
added
the
Release critical
|
This is critical as it removes the last banner from the doc website. |
dstansby
approved these changes
Aug 7, 2018
| @@ -3,39 +3,53 @@ | |||
| GitHub Stats | |||
| ============ | |||
|
|
|||
| GitHub stats for 2017/10/03 - 2018/03/16 (tag: v2.1.0) | |||
| GitHub stats for 2017/10/03 - 2018/07/15 (tag: v2.1.0) | |||
There was a problem hiding this comment.
This will get re-updated as part of the 3.0 release procedure.
dstansby
approved these changes
Aug 8, 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.
There are many commits in this (as it is merging up the 2.2.x branch, but most of the commits are backports so the actual changes are small.