Merge remote-tracking branch 'upstream/master' into pdf-improve

jkseppan · jkseppan · commit 73de372af472 · 2019-06-05T06:09:53.000+03:00
The pytest version requirement has changed.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -66,7 +66,7 @@ install:
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
-  - pip install -q "pytest>=3.4,<4.6" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
+  - pip install -q "pytest>=3.4,!=4.6.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
 
   # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
   # https://github.com/matplotlib/matplotlib/issues/9176
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://numfocus.salsalabs.org/donate-to-matplotlib/index.html
diff --git a/LICENSE/LICENSE_PAINT b/LICENSE/LICENSE_PAINT
@@ -0,0 +1,20 @@
+Copyright 2000 by Object Craft P/L, Melbourne, Australia.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Object Craft
+is not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+OBJECT CRAFT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL OBJECT CRAFT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/doc/users/next_whats_new/2019-05-31-AL.rst b/doc/users/next_whats_new/2019-05-31-AL.rst
@@ -0,0 +1,4 @@
+The *fname* argument to `FontProperties` can now be an `os.PathLike`\s
+``````````````````````````````````````````````````````````````````````
+
+e.g. ``FontProperties(fname=pathlib.Path("/path/to/font.ttf"))``.
diff --git a/examples/animation/random_walk.py b/examples/animation/random_walk.py
@@ -15,10 +15,14 @@
 
 def gen_rand_line(length, dims=2):
     """
-    Create a line using a random walk algorithm
-
-    length is the number of points for the line.
-    dims is the number of dimensions the line has.
+    Create a line using a random walk algorithm.
+
+    Parameters
+    ----------
+    length : int
+        The number of points of the line.
+    dims : int
+        The number of dimensions of the line.
     """
     line_data = np.empty((dims, length))
     line_data[:, 0] = np.random.rand(dims)
diff --git a/examples/animation/strip_chart.py b/examples/animation/strip_chart.py
@@ -40,7 +40,7 @@ def update(self, y):
 
 
 def emitter(p=0.03):
-    'return a random value with probability p, else 0'
+    """Return a random value in [0, 1) with probability p, else 0."""
     while True:
         v = np.random.rand(1)
         if v > p:
diff --git a/examples/axisartist/demo_axis_direction.py b/examples/axisartist/demo_axis_direction.py
@@ -19,9 +19,7 @@
 
 
 def setup_axes(fig, rect):
-    """
-    polar projection, but in a rectangular box.
-    """
+    """Polar projection, but in a rectangular box."""
 
     # see demo_curvelinear_grid.py for details
     tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform()
diff --git a/examples/axisartist/demo_curvelinear_grid2.py b/examples/axisartist/demo_curvelinear_grid2.py
@@ -22,9 +22,7 @@
 
 
 def curvelinear_test1(fig):
-    """
-    grid for custom transform.
-    """
+    """Grid for custom transform."""
 
     def tr(x, y):
         sgn = np.sign(x)
diff --git a/examples/axisartist/simple_axis_pad.py b/examples/axisartist/simple_axis_pad.py
@@ -19,9 +19,7 @@
 
 
 def setup_axes(fig, rect):
-    """
-    polar projection, but in a rectangular box.
-    """
+    """Polar projection, but in a rectangular box."""
 
     # see demo_curvelinear_grid.py for details
     tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform()
diff --git a/examples/event_handling/pick_event_demo2.py b/examples/event_handling/pick_event_demo2.py
@@ -3,9 +3,9 @@
 Pick Event Demo2
 ================
 
-compute the mean and standard deviation (stddev) of 100 data sets and plot
-mean vs stddev.  When you click on one of the mu, sigma points, plot the raw
-data from the dataset that generated the mean and stddev.
+Compute the mean (mu) and standard deviation (sigma) of 100 data sets and plot
+mu vs. sigma.  When you click on one of the (mu, sigma) points, plot the raw
+data from the dataset that generated this point.
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/images_contours_and_fields/interpolation_methods.py b/examples/images_contours_and_fields/interpolation_methods.py
@@ -1,15 +1,15 @@
 """
-=================================
-Interpolations for imshow/matshow
-=================================
+=========================
+Interpolations for imshow
+=========================
 
 This example displays the difference between interpolation methods for
-:meth:`~.axes.Axes.imshow` and :meth:`~.axes.Axes.matshow`.
+:meth:`~.axes.Axes.imshow`.
 
-If `interpolation` is None, it defaults to the ``image.interpolation``
-:doc:`rc parameter </tutorials/introductory/customizing>`.
-If the interpolation is ``'none'``, then no interpolation is performed
-for the Agg, ps and pdf backends. Other backends will default to ``'nearest'``.
+If `interpolation` is None, it defaults to the :rc:`image.interpolation`
+(default: ``'nearest'``). If the interpolation is ``'none'``, then no
+interpolation is performed for the Agg, ps and pdf backends. Other backends
+will default to ``'nearest'``.
 
 For the Agg, ps and pdf backends, ``interpolation = 'none'`` works well when a
 big image is scaled down, while ``interpolation = 'nearest'`` works well when
diff --git a/examples/text_labels_and_annotations/font_file.py b/examples/text_labels_and_annotations/font_file.py
@@ -15,16 +15,17 @@
 :doc:`/gallery/text_labels_and_annotations/fonts_demo`.
 """
 
-import os
-from matplotlib import font_manager as fm, rcParams
+from pathlib import Path
+
+import matplotlib as mpl
+from matplotlib import font_manager as fm
 import matplotlib.pyplot as plt
 
 fig, ax = plt.subplots()
 
-fpath = os.path.join(rcParams["datapath"], "fonts/ttf/cmr10.ttf")
+fpath = Path(mpl.get_data_path(), "fonts/ttf/cmr10.ttf")
 prop = fm.FontProperties(fname=fpath)
-fname = os.path.split(fpath)[1]
-ax.set_title('This is a special font: {}'.format(fname), fontproperties=prop)
+ax.set_title(f'This is a special font: {fpath.name}', fontproperties=prop)
 ax.set_xlabel('This is the default font')
 
 plt.show()
diff --git a/examples/widgets/span_selector.py b/examples/widgets/span_selector.py
@@ -38,9 +38,17 @@ def onselect(xmin, xmax):
     ax2.set_ylim(thisy.min(), thisy.max())
     fig.canvas.draw()
 
-# Set useblit=True on most backends for enhanced performance.
+#############################################################################
+# .. note::
+#
+#    If the SpanSelector object is garbage collected you will lose the
+#    interactivity.  You must keep a hard reference to it to prevent this.
+#
+
+
 span = SpanSelector(ax1, onselect, 'horizontal', useblit=True,
                     rectprops=dict(alpha=0.5, facecolor='red'))
+# Set useblit=True on most backends for enhanced performance.
 
 
 plt.show()
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -13,9 +13,9 @@
 
 It is pretty easy to use, and requires only built-in python libs:
 
-    >>> from matplotlib import rcParams
+    >>> import matplotlib as mpl
     >>> import os.path
-    >>> afm_fname = os.path.join(rcParams['datapath'],
+    >>> afm_fname = os.path.join(mpl.get_data_path(),
     ...                         'fonts', 'afm', 'ptmr8a.afm')
     >>>
     >>> from matplotlib.afm import AFM
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6309,6 +6309,9 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
             ret.set_clim(vmin, vmax)
         elif np.ndim(C) == 2:  # C.ndim == 3 is RGB(A) so doesn't need scaling.
             ret.autoscale_None()
+        if ret.get_clip_path() is None:
+            # image does not already have clipping set, clip to axes patch
+            ret.set_clip_path(self.patch)
 
         ret.sticky_edges.x[:] = [xl, xr]
         ret.sticky_edges.y[:] = [yb, yt]
diff --git a/lib/matplotlib/backends/web_backend/js/mpl.js b/lib/matplotlib/backends/web_backend/js/mpl.js
@@ -346,7 +346,7 @@ mpl.figure.prototype.handle_rubberband = function(fig, msg) {
     var height = Math.abs(y1 - y0);
 
     fig.rubberband_context.clearRect(
-        0, 0, fig.canvas.width, fig.canvas.height);
+        0, 0, fig.canvas.width / mpl.ratio, fig.canvas.height / mpl.ratio);
 
     fig.rubberband_context.strokeRect(min_x, min_y, width, height);
 }
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1444,12 +1444,10 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             Controls sharing of properties among x (`sharex`) or y (`sharey`)
             axes:
 
-                - True or 'all': x- or y-axis will be shared among all
-                  subplots.
-                - False or 'none': each subplot x- or y-axis will be
-                  independent.
-                - 'row': each subplot row will share an x- or y-axis.
-                - 'col': each subplot column will share an x- or y-axis.
+            - True or 'all': x- or y-axis will be shared among all subplots.
+            - False or 'none': each subplot x- or y-axis will be independent.
+            - 'row': each subplot row will share an x- or y-axis.
+            - 'col': each subplot column will share an x- or y-axis.
 
             When subplots have a shared x-axis along a column, only the x tick
             labels of the bottom subplot are created. Similarly, when subplots
@@ -1461,12 +1459,11 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             - If True, extra dimensions are squeezed out from the returned
               array of Axes:
 
-                - if only one subplot is constructed (nrows=ncols=1), the
-                  resulting single Axes object is returned as a scalar.
-                - for Nx1 or 1xM subplots, the returned object is a 1D numpy
-                  object array of Axes objects.
-                - for NxM, subplots with N>1 and M>1 are returned
-                  as a 2D array.
+              - if only one subplot is constructed (nrows=ncols=1), the
+                resulting single Axes object is returned as a scalar.
+              - for Nx1 or 1xM subplots, the returned object is a 1D numpy
+                object array of Axes objects.
+              - for NxM, subplots with N>1 and M>1 are returned as a 2D array.
 
             - If False, no squeezing at all is done: the returned Axes object
               is always a 2D array containing Axes instances, even if it ends
@@ -1501,19 +1498,18 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             # Create a figure
             plt.figure()
 
-            # Creates a subplot
+            # Create a subplot
             ax = fig.subplots()
             ax.plot(x, y)
             ax.set_title('Simple plot')
 
-            # Creates two subplots and unpacks the output array immediately
+            # Create two subplots and unpack the output array immediately
             ax1, ax2 = fig.subplots(1, 2, sharey=True)
             ax1.plot(x, y)
             ax1.set_title('Sharing Y axis')
             ax2.scatter(x, y)
 
-            # Creates four polar axes, and accesses them through the
-            # returned array
+            # Create four polar axes and access them through the returned array
             axes = fig.subplots(2, 2, subplot_kw=dict(polar=True))
             axes[0, 0].plot(x, y)
             axes[1, 1].scatter(x, y)
@@ -1530,12 +1526,12 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             # Note that this is the same as
             fig.subplots(2, 2, sharex=True, sharey=True)
 
-            See Also
-            --------
-            .pyplot.subplots
-            .Figure.add_subplot
-            .pyplot.subplot
-            """
+        See Also
+        --------
+        .pyplot.subplots
+        .Figure.add_subplot
+        .pyplot.subplot
+        """
 
         if isinstance(sharex, bool):
             sharex = "all" if sharex else "none"
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1275,7 +1275,7 @@ def is_opentype_cff_font(filename):
 def get_font(filename, hinting_factor=None):
     if hinting_factor is None:
         hinting_factor = rcParams['text.hinting_factor']
-    return _get_font(filename, hinting_factor)
+    return _get_font(os.fspath(filename), hinting_factor)
 
 
 def _rebuild():
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1056,12 +1056,10 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
         Controls sharing of properties among x (`sharex`) or y (`sharey`)
         axes:
 
-            - True or 'all': x- or y-axis will be shared among all
-              subplots.
-            - False or 'none': each subplot x- or y-axis will be
-              independent.
-            - 'row': each subplot row will share an x- or y-axis.
-            - 'col': each subplot column will share an x- or y-axis.
+        - True or 'all': x- or y-axis will be shared among all subplots.
+        - False or 'none': each subplot x- or y-axis will be independent.
+        - 'row': each subplot row will share an x- or y-axis.
+        - 'col': each subplot column will share an x- or y-axis.
 
         When subplots have a shared x-axis along a column, only the x tick
         labels of the bottom subplot are created. Similarly, when subplots
@@ -1073,11 +1071,11 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
         - If True, extra dimensions are squeezed out from the returned
           array of `~matplotlib.axes.Axes`:
 
-            - if only one subplot is constructed (nrows=ncols=1), the
-              resulting single Axes object is returned as a scalar.
-            - for Nx1 or 1xM subplots, the returned object is a 1D numpy
-              object array of Axes objects.
-            - for NxM, subplots with N>1 and M>1 are returned as a 2D array.
+          - if only one subplot is constructed (nrows=ncols=1), the
+            resulting single Axes object is returned as a scalar.
+          - for Nx1 or 1xM subplots, the returned object is a 1D numpy
+            object array of Axes objects.
+          - for NxM, subplots with N>1 and M>1 are returned as a 2D array.
 
         - If False, no squeezing at all is done: the returned Axes object is
           always a 2D array containing Axes instances, even if it ends up
@@ -1133,18 +1131,18 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
         x = np.linspace(0, 2*np.pi, 400)
         y = np.sin(x**2)
 
-        # Creates just a figure and only one subplot
+        # Create just a figure and only one subplot
         fig, ax = plt.subplots()
         ax.plot(x, y)
         ax.set_title('Simple plot')
 
-        # Creates two subplots and unpacks the output array immediately
+        # Create two subplots and unpack the output array immediately
         f, (ax1, ax2) = plt.subplots(1, 2, sharey=True)
         ax1.plot(x, y)
         ax1.set_title('Sharing Y axis')
         ax2.scatter(x, y)
 
-        # Creates four polar axes, and accesses them through the returned array
+        # Create four polar axes and access them through the returned array
         fig, axs = plt.subplots(2, 2, subplot_kw=dict(polar=True))
         axs[0, 0].plot(x, y)
         axs[1, 1].scatter(x, y)
@@ -1161,7 +1159,7 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
         # Note that this is the same as
         plt.subplots(2, 2, sharex=True, sharey=True)
 
-        # Creates figure number 10 with a single subplot
+        # Create figure number 10 with a single subplot
         # and clears it if it already exists.
         fig, ax = plt.subplots(num=10, clear=True)
 
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
diff --git a/lib/matplotlib/tests/baseline_images/test_quiver/barbs_test_flip.png b/lib/matplotlib/tests/baseline_images/test_quiver/barbs_test_flip.png
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
diff --git a/requirements/testing/travis_all.txt b/requirements/testing/travis_all.txt
diff --git a/src/_png.cpp b/src/_png.cpp

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# These are supported funding model platforms`
	`2`	`+`
	`3`	`+custom: https://numfocus.salsalabs.org/donate-to-matplotlib/index.html`