Merge pull request #8583 from dstansby/travis-pandas

tacaswell · web-flow · commit 45f383d83ed4 · 2017-05-07T15:18:32.000-04:00
TST: Fix pandas datetime test on pandas 0.20
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -437,7 +437,7 @@ def test_date2num_dst_pandas():
     pd = pytest.importorskip('pandas')
 
     def tz_convert(*args):
-        return pd.DatetimeIndex.tz_convert(*args).astype(datetime.datetime)
+        return pd.DatetimeIndex.tz_convert(*args).astype(object)
 
     _test_date2num_dst(pd.date_range, tz_convert)
 
