Merge remote-tracking branch 'origin/v3.0.2-doc' into v3.0.x-pi

tacaswell · tacaswell · commit a8933ef6e9b9 · 2019-02-22T22:46:24.000-05:00
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
diff --git a/.flake8 b/.flake8
@@ -253,6 +253,7 @@ per-file-ignores =
     examples/subplots_axes_and_figures/zoom_inset_axes.py: E402
     examples/tests/backend_driver_sgskip.py: E402, E501
     examples/text_labels_and_annotations/annotation_demo.py: E501
+    examples/text_labels_and_annotations/demo_text_rotation_mode.py: E402 
     examples/text_labels_and_annotations/custom_legends.py: E402
     examples/text_labels_and_annotations/font_family_rc_sgskip.py: E402
     examples/text_labels_and_annotations/font_file.py: E402
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -52,5 +52,3 @@ Switching backends via `matplotlib.use` is now allowed by default,
 regardless of whether `matplotlib.pyplot` has been imported. If the user
 tries to switch from an already-started interactive backend to a different
 interactive backend, an ImportError will be raised.
-
-
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -27,6 +27,12 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
 
 DOIs
 ----
+v3.0.2
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482099.svg
+      :target: https://doi.org/10.5281/zenodo.1482099
+v3.0.1
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482098.svg
+      :target: https://doi.org/10.5281/zenodo.1482098
 v3.0.0
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1420605.svg
       :target: https://doi.org/10.5281/zenodo.1420605
diff --git a/examples/text_labels_and_annotations/demo_text_rotation_mode.py b/examples/text_labels_and_annotations/demo_text_rotation_mode.py
@@ -1,8 +1,14 @@
-"""
-=======================
+"""=======================
 Demo Text Rotation Mode
 =======================
 
+The axes' method `~.axes.Axes.text` takes an argument ``rotation_mode`` that
+controls the alignment and rotation of the text. If ``rotation_mode`` is
+``None`` or ``default`` the text will first be rotated and then aligned
+according to the horizontal and vertical alignments (``ha`` and ``va`` in the
+example). If ``rotation_mode`` is ``anchor`` the text is aligned before
+rotation.
+
 """
 from mpl_toolkits.axes_grid1.axes_grid import ImageGrid
 
@@ -19,18 +25,23 @@ def test_rotation_mode(fig, mode, subplot_location):
     for ha, ax in zip(ha_list, grid.axes_row[-1]):
         ax.axis["bottom"].label.set_text(ha)
 
+    # create a grid of axes to display text on.
     grid.axes_row[0][1].set_title(mode, size="large")
 
     for va, ax in zip(va_list, grid.axes_column[0]):
         ax.axis["left"].label.set_text(va)
 
+    # use a different horizontal and vertical alignment for the text in each
+    # axes.
     i = 0
     for va in va_list:
         for ha in ha_list:
             ax = grid[i]
             for axis in ax.axis.values():
                 axis.toggle(ticks=False, ticklabels=False)
 
+            # add text to the axes. Set the rotation_mode, horizontal
+            # alignment (ha) and vertical alignment (va).
             ax.text(0.5, 0.5, "Tpg",
                     size="large", rotation=40,
                     bbox=dict(boxstyle="square,pad=0.",
@@ -50,3 +61,16 @@ def test_rotation_mode(fig, mode, subplot_location):
     test_rotation_mode(fig, "default", 121)
     test_rotation_mode(fig, "anchor", 122)
     plt.show()
+
+
+#############################################################################
+#
+# ------------
+#
+# References
+# """"""""""
+#
+# The use of the following method is shown in this example:
+
+import matplotlib
+matplotlib.axes.Axes.text
