8000 Merge pull request #8583 from dstansby/travis-pandas · matplotlib/matplotlib@45f383d · GitHub
[go: up one dir, main page]

Skip to content

Commit 45f383d

Browse files
authored
Merge pull request #8583 from dstansby/travis-pandas
TST: Fix pandas datetime test on pandas 0.20
2 parents e232afe + 7387bc5 commit 45f383d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/matplotlib/tests/test_dates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def test_date2num_dst_pandas():
437437
pd = pytest.importorskip('pandas')
438438

439439
def tz_convert(*args):
440-
return pd.DatetimeIndex.tz_convert(*args).astype(datetime.datetime)
440+
return pd.DatetimeIndex.tz_convert(*args).astype(object)
441441

442442
_test_date2num_dst(pd.date_range, tz_convert)
443443

0 commit comments

Comments
 (0)
0