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

Conflicts:
	INSTALL

Author: mdboom

INSTALL

@@ -185,17 +185,6 @@ the libraries themselves.
 :term:`numpy` |minimum_numpy_version| (or later)
     array support for python (`download numpy <http://numpy.org>`_)
 
-libpng 1.2 (or later)
-    library for loading and saving :term:`PNG` files (`download
-    <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
-    zlib. If you are a Windows user, you can ignore this because we
-    build support into the matplotlib single-click installer
-
-:term:`freetype` 1.4 (or later)
-    library for reading true type font files. If you are a windows
-    user, you can ignore this since we build support into the
-    matplotlib single click installer.
-
 :term:`dateutil` 1.1 or later
     Provides extensions to python datetime handling.  If using pip,
     easy_install or installing from source, the installer will attempt
@@ -209,13 +198,29 @@ libpng 1.2 (or later)
     using pip, easy_install or installing from source, the installer
     will attempt to download and install `pyparsing` from PyPI.
 
+<<<<<<< HEAD
 **Optional dependencies**
 
 `Pillow http://python-imaging.github.io/`__
     If Pillow is installed, matplotlib can read and write a larger
     selection of image file formats.
 
 **Optional GUI frameworks**
+=======
+libpng 1.2 (or later)
+    library for loading and saving :term:`PNG` files (`download
+    <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
+    zlib. If you are a Windows user, you can ignore this because we
+    build support into the matplotlib single-click installer
+
+:term:`freetype` 1.4 (or later)
+    library for reading true type font files. If you are a windows
+    user, you can ignore this since we build support into the
+    matplotlib single click installer.
+
+
+**Optional**
+>>>>>>> upstream/v1.3.x
 
 These are optional packages which you may want to install to use
 matplotlib with a user interface toolkit. See

lib/matplotlib/__init__.py

@@ -754,7 +754,7 @@ def matplotlib_fname():
                     "Found matplotlib configuration in ~/.matplotlib/. "
                     "To conform with the XDG base directory standard, "
                     "this configuration location has been deprecated "
-                    "on Linux, and the new location is now %r/matplotlib/. "
+                    "on Linux, and the new location is now %s/matplotlib/. "
                     "Please move your configuration there to ensure that "
                     "matplotlib will continue to find it in the future." %
                     _get_xdg_config_dir())

lib/matplotlib/axes/_axes.py

@@ -1238,18 +1238,24 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
             colls.append(coll)
 
         if len(positions) > 0:
-            minpos = min(position.min() for position in positions)
-            maxpos = max(position.max() for position in positions)
-
-            minline = (lineoffsets - linelengths).min()
-            maxline = (lineoffsets + linelengths).max()
-
-            if colls[0].is_horizontal():
-                corners = (minpos, minline), (maxpos, maxline)
-            else:
-                corners = (minline, minpos), (maxline, maxpos)
-            self.update_datalim(corners)
-            self.autoscale_view()
+            # try to get min/max
+            min_max = [(np.min(_p), np.max(_p)) for _p in positions
+                       if len(_p) > 0]
+            # if we have any non-empty positions, try to autoscale
+            if len(min_max) > 0:
+                mins, maxes = zip(*min_max)
+                minpos = np.min(mins)
+                maxpos = np.max(maxes)
+
+                minline = (lineoffsets - linelengths).min()
+                maxline = (lineoffsets + linelengths).max()
+
+                if colls[0].is_horizontal():
+                    corners = (minpos, minline), (maxpos, maxline)
+                else:
+                    corners = (minline, minpos), (maxline, maxpos)
+                self.update_datalim(corners)
+                self.autoscale_view()
 
         return colls
 
@@ -4670,6 +4676,9 @@ def pcolor(self, *args, **kwargs):
           *alpha*: ``0 <= scalar <= 1``   or *None*
             the alpha blending value
 
+          *snap*: bool
+            Whether to snap the mesh to pixel boundaries.
+
         Return value is a :class:`matplotlib.collections.Collection`
         instance.
 
@@ -4819,6 +4828,8 @@ def pcolor(self, *args, **kwargs):
                 ec.lower() == "none"):
             kwargs['antialiaseds'] = False
 
+        kwargs.setdefault('snap', False)
+
         collection = mcoll.PolyCollection(verts, **kwargs)
 
         collection.set_alpha(alpha)

lib/matplotlib/lines.py

@@ -536,7 +536,7 @@ def draw(self, renderer):
         self._set_gc_clip(gc)
 
         ln_color_rgba = self._get_rgba_ln_color()
-        gc.set_foreground(ln_color_rgba)
+        gc.set_foreground(ln_color_rgba, isRGBA=True)
         gc.set_alpha(ln_color_rgba[3])
 
         gc.set_antialiased(self._antialiased)
@@ -571,7 +571,7 @@ def draw(self, renderer):
             edgecolor = self.get_markeredgecolor()
             if is_string_like(edgecolor) and edgecolor.lower() == 'none':
                 gc.set_linewidth(0)
-                gc.set_foreground(rgbaFace)
+                gc.set_foreground(rgbaFace, isRGBA=True)
             else:
                 gc.set_foreground(edgecolor)
                 gc.set_linewidth(self._markeredgewidth)
@@ -1019,12 +1019,7 @@ def _get_rgba_face(self, alt=False):
         return rgbaFace
 
     def _get_rgba_ln_color(self, alt=False):
-        ln_color = self._color
-        if is_string_like(ln_color) and ln_color.lower() == 'none':
-            rgba_ln = None
-        else:
-            rgba_ln = colorConverter.to_rgba(ln_color, self._alpha)
-        return rgba_ln
+        return colorConverter.to_rgba(self._color, self._alpha)
 
     # some aliases....
     def set_aa(self, val):

lib/matplotlib/tests/test_axes.py

@@ -1682,6 +1682,14 @@ def test_eventplot():
     num_collections = len(colls)
     np.testing.assert_equal(num_collections, num_datasets)
 
+
+@cleanup
+def test_empty_eventplot():
+    fig, ax = plt.subplots(1, 1)
+    ax.eventplot([[]], colors=[(0.0, 0.0, 0.0, 0.0)])
+    plt.draw()
+
+
 @image_comparison(baseline_images=['vertex_markers'], extensions=['png'],
                   remove_text=True)
 def test_vertex_markers():
@@ -1774,6 +1782,7 @@ def test_mixed_collection():
     ax.set_xlim(0, 16)
     ax.set_ylim(0, 16)
 
+
 @cleanup
 def test_subplot_key_hash():
     ax = plt.subplot(np.float64(5.5), np.int64(1), np.float64(1.2))

lib/matplotlib/tests/test_lines.py

@@ -71,6 +71,19 @@ def test_set_line_coll_dash():
     assert True
 
 
+@cleanup
+def test_line_colors():
+    fig = plt.figure()
+    ax = fig.add_subplot(1, 1, 1)
+    ax.plot(range(10), color='none')
+    ax.plot(range(10), color='r')
+    ax.plot(range(10), color='.3')
+    ax.plot(range(10), color=(1, 0, 0, 1))
+    ax.plot(range(10), color=(1, 0, 0))
+    fig.canvas.draw()
+    assert True
+
+
 @image_comparison(baseline_images=['line_collection_dashes'], remove_text=True)
 def test_set_line_coll_dash_image():
     fig = plt.figure()