Merge branch 'matplotlib:master' into patch-2

Author: Tortar

.flake8

@@ -110,6 +110,7 @@ per-file-ignores =
     tutorials/toolkits/axisartist.py: E501
 
     examples/animation/frame_grabbing_sgskip.py: E402
+    examples/lines_bars_and_markers/marker_reference.py: E402
     examples/images_contours_and_fields/tricontour_demo.py: E201
     examples/images_contours_and_fields/tripcolor_demo.py: E201
     examples/images_contours_and_fields/triplot_demo.py: E201

doc/_static/mpl.css

@@ -207,3 +207,9 @@ does not float with it.
     visibility: hidden;
 
 }
+
+
+table.property-table th,
+table.property-table td {
+    padding: 4px 10px;
+}

doc/api/animation_api.rst

@@ -186,7 +186,6 @@ on all systems.
 
    FFMpegWriter
    ImageMagickWriter
-   AVConvWriter
 
 The file-based writers save temporary files for each frame which are stitched
 into a single file at the end.  Although slower, these writers can be easier to
@@ -198,7 +197,6 @@ debug.
 
    FFMpegFileWriter
    ImageMagickFileWriter
-   AVConvFileWriter
 
 Fundamentally, a `MovieWriter` provides a way to grab sequential frames
 from the same underlying `~matplotlib.figure.Figure` object.  The base
@@ -283,7 +281,6 @@ and mixins
    :toctree: _as_gen
    :nosignatures:
 
-   AVConvBase
    FFMpegBase
    ImageMagickBase
 
@@ -298,6 +295,6 @@ Inheritance Diagrams
    :private-bases:
    :parts: 1
 
-.. inheritance-diagram:: matplotlib.animation.AVConvFileWriter matplotlib.animation.AVConvWriter matplotlib.animation.FFMpegFileWriter matplotlib.animation.FFMpegWriter matplotlib.animation.ImageMagickFileWriter matplotlib.animation.ImageMagickWriter
+.. inheritance-diagram:: matplotlib.animation.FFMpegFileWriter matplotlib.animation.FFMpegWriter matplotlib.animation.ImageMagickFileWriter matplotlib.animation.ImageMagickWriter
    :private-bases:
    :parts: 1

doc/api/artist_api.rst

@@ -36,8 +36,6 @@ Interactive
    Artist.format_cursor_data
    Artist.mouseover
    Artist.contains
-   Artist.set_contains
-   Artist.get_contains
    Artist.pick
    Artist.pickable
    Artist.set_picker

doc/api/axes_api.rst

@@ -606,3 +606,4 @@ Other
    Axes.get_default_bbox_extra_artists
    Axes.get_transformed_clip_path_and_affine
    Axes.has_data
+   Axes.set

doc/api/axis_api.rst

@@ -181,6 +181,7 @@ XAxis Specific
    XAxis.get_text_heights
    XAxis.get_ticks_position
    XAxis.set_ticks_position
+   XAxis.set_label_position
    XAxis.tick_bottom
    XAxis.tick_top
 
@@ -197,6 +198,7 @@ YAxis Specific
    YAxis.get_ticks_position
    YAxis.set_offset_position
    YAxis.set_ticks_position
+   YAxis.set_label_position
    YAxis.tick_left
    YAxis.tick_right
 
@@ -264,4 +266,5 @@ specify a matching series of labels.  Calling ``set_ticks`` makes a
    Tick.set_label1
    Tick.set_label2
    Tick.set_pad
+   Tick.set_url
    Tick.update_position

doc/api/next_api_changes.rst

@@ -1,21 +1,10 @@
 
 ================
-Next API Changes
+Next API changes
 ================
 
 .. ifconfig:: releaselevel == 'dev'
 
-   .. note::
-
-      The list below is a table of contents of individual files from the
-      most recent :file:`api_changes_X.Y` folder.
-
-      When a release is made
-
-       - The include directive below should be changed to point to the new file
-         created in the previous step.
-
-
    .. toctree::
       :glob:
       :maxdepth: 1

doc/api/next_api_changes/behavior/20054-JMK.rst

@@ -1,19 +1,12 @@
-Axes used to make colorbar now wrapped
-======================================
-
-The axes used to place a colorbar is now wrapped by a new parent class
-(``ColorbarAxes``) when the colorbar is created::
-
-    cb = fig.colorbar(im, cax=cax)
-
-This means that ``cb.ax`` is no longer the same object as ``cax``. However, 
-we map all the methods from ``cb.ax`` onto ``cax`` so ``cax`` should remain 
-functionally the same as ``cb.ax``.  
-
 Colorbar lines no longer clipped
 ================================
 
 If a colorbar has lines added to it (e.g. for contour lines), these will
 no longer be clipped.  This is an improvement for lines on the edge of
 the colorbar, but could lead to lines off the colorbar if the limits of
 the colorbar are changed.
+
+``Colorbar.patch`` is deprecated
+================================
+
+This attribute is not correctly updated anymore.

doc/api/next_api_changes/deprecations/19441-AL.rst

@@ -1,4 +1,5 @@
-``backend_gtk3.cursord``
-~~~~~~~~~~~~~~~~~~~~~~~~
-This dict is deprecated, in order to make the module importable on headless
-environments.
+``cursord`` in GTK, Qt, and wx backends
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``backend_gtk3.cursord``, ``backend_qt.cursord``, and
+``backend_wx.cursord`` dictionaries are deprecated. This makes the GTK module
+importable on headless environments.

doc/api/next_api_changes/deprecations/19483-JMK.rst

@@ -1,7 +1,7 @@
 ``epoch2num`` and ``num2epoch`` are deprecated
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 These methods convert from unix timestamps to matplotlib floats, but are not
-useed internally to matplotlib, and should not be needed by endusers.
+used internally to matplotlib, and should not be needed by endusers.
 To convert a unix timestamp to datetime, simply use
 `datetime.datetime.utcfromtimestamp`, or to use numpy datetime64
 ``dt = np.datetim64(e*1e6, 'us')``.