Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/axes/_axes.py
	lib/matplotlib/backends/backend_pgf.py

Author: mdboom

.travis.yml

@@ -35,7 +35,5 @@ script:
   - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300
 
 after_failure:
-  - cd ../tmp_test_dir
-  - tar cjf result_images.tar.bz2 result_images
-  - travis-artifacts upload --path result_images.tar.bz2
-  - echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2
+  - cd ../matplotlib
+  - ./travis_upload.sh

lib/matplotlib/axes/_axes.py

@@ -5376,11 +5376,11 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             xvals, yvals = [], []
             for m in n:
                 # starting point for drawing polygon
-                y[0] = y[-1]
+                y[0] = y[1]
                 # top of the previous polygon becomes the bottom
                 y[2*len(bins)-1:] = y[1:2*len(bins)-1][::-1]
                 # set the top of this polygon
-                y[1:2*len(bins)-1:2], y[2:2*len(bins):2] = m, m
+                y[1:2*len(bins)-1:2], y[2:2*len(bins)-1:2] = m, m
                 if log:
                     y[y < minimum] = minimum
                 if orientation == 'horizontal':
@@ -5399,8 +5399,8 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                         closed=True,
                         facecolor=c))
             else:
-                for x, y, c in reversed(list(zip(xvals, yvals, color))):
-                    split = int(len(x) / 2) + 1
+                for x, y, c in reversed(zip(xvals, yvals, color)):
+                    split = 2 * len(bins)
                     patches.append(self.fill(
                         x[:split], y[:split],
                         closed=False, edgecolor=c,

lib/matplotlib/tests/__init__.py

@@ -14,7 +14,17 @@ def setup():
     # The baseline images are created in this locale, so we should use
     # it during all of the tests.
     import locale
-    locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
+    import warnings
+
+    try:
+        locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
+    except:
+        try:
+            locale.setlocale(locale.LC_ALL, str('English_United States.1252'))
+        except:
+            warnings.warn(
+                "Could not set locale to English/United States. "
+                "Some date-related tests may fail")
 
     use('Agg', warn=False) # use Agg backend for these tests
 

lib/matplotlib/tests/baseline_images/test_axes/hist_step.png

@@ -1121,6 +1121,17 @@ def test_hist_offset():
     ax.hist(d2, bottom=15)
 
 
+@image_comparison(baseline_images=['hist_step'], extensions=['png'], remove_text=True)
+def test_hist_step():
+    # make some data
+    d1 = np.linspace(1, 3, 20)
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.hist( d1, histtype="step")
+    ax.set_ylim(0, 10)
+    ax.set_xlim(-1, 5)
+
+
 @image_comparison(baseline_images=['hist_stacked_weights'])
 def test_hist_stacked_weighted():
     # make some data

lib/matplotlib/tests/test_axes.py

@@ -1054,8 +1054,8 @@ def compute_dof_from_df(self):
         gradient.
         """
         J = CubicTriInterpolator._get_jacobian(self._tris_pts)
-        tri_z = self.z[self._triangles, :]
-        tri_dz = self.dz[self._triangles, :]
+        tri_z = self.z[self._triangles]
+        tri_dz = self.dz[self._triangles]
         tri_dof = self.get_dof_vec(tri_z, tri_dz, J)
         return tri_dof
 

lib/matplotlib/tri/triinterpolate.py

@@ -54,13 +54,18 @@
 #           otherwise skip silently. This is the default
 #           behavior
 #
+#agg = auto
+#cairo = auto
 #gtk = auto
+#gtk3agg = auto
+#gtk3cairo = auto
 #gtkagg = auto
-#tkagg = auto
 #macosx = auto
+#pyside = auto
+#qt4agg = auto
+#tkagg = auto
 #windowing = auto
-#gtk3cairo = auto
-#gtk3agg = auto
+#wxagg = auto
 
 [rc_options]
 # User-configurable options

setup.cfg.template

@@ -438,38 +438,66 @@ def _check_for_pkg_config(self, package, include_file, min_version=None,
 
 class OptionalPackage(SetupPackage):
     optional = True
+    force = False
+    config_category = "packages"
 
     def get_config(self):
-        install = True
-        if config is not None:
-            try:
-                install = config.getboolean(
-                    'packages', self.name)
-            except:
-                pass
-        return install
+        """
+        Look at `setup.cfg` and return one of ["auto", True, False] indicating
+        if the package is at default state ("auto"), forced by the user (True)
+        or opted-out (False).
+        """
+        try:
+            return config.getboolean(self.config_category, self.name)
+        except:
+            return "auto"
 
     def check(self):
-        self.install = self.get_config()
-        if not self.install:
-            raise CheckFailed("skipping due to configuration")
-        return "installing"
+        """
+        Do not override this method!
 
+        For custom dependency checks override self.check_requirements().
+        Two things are checked: Configuration file and requirements.
+        """
+        # Check configuration file
+        conf = self.get_config()
+        # Default "auto" state or install forced by user
+        if conf in [True, 'auto']:
+            message = "installing"
+            # Set non-optional if user sets `True` in config
+            if conf is True:
+                self.optional = False
+        # Configuration opt-out by user
+        else:
+            # Some backend extensions (e.g. Agg) need to be built for certain
+            # other GUI backends (e.g. TkAgg) even when manually disabled
+            if self.force is True:
+                message = "installing forced (config override)"
+            else:
+                raise CheckFailed("skipping due to configuration")
 
-class OptionalBackendPackage(SetupPackage):
-    optional = True
+        # Check requirements and add extra information (if any) to message.
+        # If requirements are not met a CheckFailed should be raised in there.
+        additional_info = self.check_requirements()
+        if additional_info:
+            message += ", " + additional_info
+
+        # No CheckFailed raised until now, return install message.
+        return message
+
+    def check_requirements(self):
+        """
+        Override this method to do custom dependency checks.
+
+         - Raise CheckFailed() if requirements are not met.
+         - Return message with additional information, or an empty string
+           (or None) for no additional information.
+        """
+        return ""
 
-    def get_config(self):
-        install = 'auto'
-        if config is not None:
-            try:
-                install = config.getboolean(
-                    'gui_support', self.name)
-            except:
-                install = 'auto'
-        if install is True:
-            self.optional = False
-        return install
+
+class OptionalBackendPackage(OptionalPackage):
+    config_category = "gui_support"
 
 
 class Platform(SetupPackage):
@@ -1025,16 +1053,6 @@ def get_install_requires(self):
 
 class BackendAgg(OptionalBackendPackage):
     name = "agg"
-    force = False
-
-    def check(self):
-        # The Agg backend extension needs to be built even
-        # for certain GUI backends, such as TkAgg
-        config = self.get_config()
-        if config is False and self.force is False:
-            raise CheckFailed("skipping due to configuration")
-        else:
-            return "installing"
 
     def get_extension(self):
         sources = [
@@ -1056,10 +1074,7 @@ class BackendTkAgg(OptionalBackendPackage):
     def __init__(self):
         self.tcl_tk_cache = None
 
-    def check(self):
-        if self.get_config() is False:
-            raise CheckFailed("skipping due to configuration")
-
+    def check_requirements(self):
         try:
             if PY3:
                 import tkinter as Tkinter
@@ -1345,10 +1360,7 @@ def add_flags(self, ext):
 class BackendGtk(OptionalBackendPackage):
     name = "gtk"
 
-    def check(self):
-        if self.get_config() is False:
-            raise CheckFailed("skipping due to configuration")
-
+    def check_requirements(self):
         try:
             import gtk
         except ImportError:
@@ -1503,7 +1515,7 @@ def backend_gtk3agg_internal_check(x):
 class BackendGtk3Agg(OptionalBackendPackage):
     name = "gtk3agg"
 
-    def check(self):
+    def check_requirements(self):
         if 'TRAVIS' in os.environ:
             raise CheckFailed("Can't build with Travis")
 
@@ -1568,7 +1580,7 @@ def backend_gtk3cairo_internal_check(x):
 class BackendGtk3Cairo(OptionalBackendPackage):
     name = "gtk3cairo"
 
-    def check(self):
+    def check_requirements(self):
         if 'TRAVIS' in os.environ:
             raise CheckFailed("Can't build with Travis")
 
@@ -1596,7 +1608,7 @@ def get_package_data(self):
 class BackendWxAgg(OptionalBackendPackage):
     name = "wxagg"
 
-    def check(self):
+    def check_requirements(self):
         try:
             import wxversion
         except ImportError:
@@ -1634,10 +1646,7 @@ def check(self):
 class BackendMacOSX(OptionalBackendPackage):
     name = 'macosx'
 
-    def check(self):
-        if self.get_config() is False:
-            raise CheckFailed("skipping due to configuration")
-
+    def check_requirements(self):
         if sys.platform != 'darwin':
             raise CheckFailed("Mac OS-X only")
 
@@ -1664,7 +1673,7 @@ class Windowing(OptionalBackendPackage):
     """
     name = "windowing"
 
-    def check(self):
+    def check_requirements(self):
         if sys.platform != 'win32':
             raise CheckFailed("Microsoft Windows only")
         config = self.get_config()
@@ -1695,7 +1704,7 @@ def convert_qt_version(self, version):
             temp.insert(0, str(int(chunk, 16)))
         return '.'.join(temp)
 
-    def check(self):
+    def check_requirements(self):
         try:
             from PyQt4 import pyqtconfig
         except ImportError:
@@ -1715,7 +1724,7 @@ def check(self):
 class BackendPySide(OptionalBackendPackage):
     name = "pyside"
 
-    def check(self):
+    def check_requirements(self):
         try:
             from PySide import __version__
             from PySide import QtCore
@@ -1731,7 +1740,7 @@ def check(self):
 class BackendCairo(OptionalBackendPackage):
     name = "cairo"
 
-    def check(self):
+    def check_requirements(self):
         try:
             import cairo
         except ImportError:

setupext.py

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+cd ../tmp_test_dir
+echo "Compressing results"
+tar cjf result_images.tar.bz2 result_images
+echo "Uploading results"
+travis-artifacts upload --path result_images.tar.bz2
+echo "Results available at:"
+echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2