TST: windows test fixes for 2.6 / older mpl

Author: jreback

pandas/tests/test_graphics.py

@@ -910,6 +910,7 @@ def setUp(self):
         mpl.rcdefaults()
 
         self.mpl_le_1_2_1 = str(mpl.__version__) <= LooseVersion('1.2.1')
+        self.mpl_ge_1_3_1 = str(mpl.__version__) >= LooseVersion('1.3.1')
 
         self.tdf = tm.makeTimeDataFrame()
         self.hexbin_df = DataFrame({"A": np.random.uniform(size=20),
@@ -1531,9 +1532,12 @@ def test_plot_scatter_with_c(self):
         for ax in axes:
             # default to RdBu
             self.assertEqual(ax.collections[0].cmap.name, 'RdBu')
-            # n.b. there appears to be no public method to get the colorbar
-            # label
-            self.assertEqual(ax.collections[0].colorbar._label, 'z')
+
+            if self.mpl_ge_1_3_1:
+
+                # n.b. there appears to be no public method to get the colorbar
+                # label
+                self.assertEqual(ax.collections[0].colorbar._label, 'z')
 
         cm = 'cubehelix'
         ax = df.plot(kind='scatter', x='x', y='y', c='z', colormap=cm)
@@ -1893,7 +1897,7 @@ def test_boxplot_axis_limits(self):
 
         def _check_ax_limits(col, ax):
             y_min, y_max = ax.get_ylim()
-            self.assertLessEqual(y_min, col.min())
+            self.assertTrue(y_min <= col.min())
             self.assertGreaterEqual(y_max, col.max())
 
         df = self.hist_df.copy()

pandas/tools/plotting.py

@@ -1392,6 +1392,9 @@ def nseries(self):
         return 1
 
     def _make_plot(self):
+        import matplotlib as mpl
+        mpl_ge_1_3_1 = str(mpl.__version__) >= LooseVersion('1.3.1')
+
         import matplotlib.pyplot as plt
 
         x, y, c, data = self.x, self.y, self.c, self.data
@@ -1419,8 +1422,10 @@ def _make_plot(self):
                              label=label, cmap=cmap, **self.kwds)
         if cb:
             img = ax.collections[0]
-            cb_label = c if c in self.data.columns else ''
-            self.fig.colorbar(img, ax=ax, label=cb_label)
+            kws = dict(ax=ax)
+            if mpl_ge_1_3_1:
+                kws['label'] = c if c in self.data.columns else ''
+            self.fig.colorbar(img, **kws)
 
         self._add_legend_handle(scatter, label)