Merge pull request #8583 from dstansby/travis-pandas

tacaswell · tacaswell · commit b0ca78c39e3d · 2017-05-07T15:19:05.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
@@ -452,7 +452,7 @@ def test_date2num_dst_pandas():
         raise SkipTest('pandas not installed')
 
     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)
 
