diff options
| author | Thomas A Caswell <tcaswell@gmail.com> | 2017-05-07 15:18:32 -0400 |
|---|---|---|
| committer | Thomas A Caswell <tcaswell@gmail.com> | 2017-05-07 15:19:05 -0400 |
| commit | b0ca78c39e3d1cf2bf6ad94f486804217f9db9dc (patch) | |
| tree | 35c762807a943c91a09478ca6810914330792262 | |
| parent | f92e79cd2454f4c16542375d35445ddbfdbc5939 (diff) | |
Merge pull request #8583 from dstansby/travis-pandas
TST: Fix pandas datetime test on pandas 0.20
| -rw-r--r-- | lib/matplotlib/tests/test_dates.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py index 26057ad90..1c441c536 100644 --- 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) |