Skip to content

Commit 1aefd4a

Browse files
committed
Merge pull request #7535 from toddrjen/nandatetime
should fix issue #7520, test_nanargmin fails with datetime64 objects
2 parents 4b3d31c + d4f8316 commit 1aefd4a

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

pandas/tests/test_nanops.py

+14-4
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,20 @@ def check_funs(self, testfunc, targfunc,
237237
self.arr_utf.astype('O')]
238238

239239
if allow_date:
240-
self.check_fun(testfunc, targfunc, 'arr_date', **kwargs)
241-
self.check_fun(testfunc, targfunc, 'arr_tdelta', **kwargs)
242-
objs += [self.arr_date.astype('O'),
243-
self.arr_tdelta.astype('O')]
240+
try:
241+
targfunc(self.arr_date)
242+
except TypeError:
243+
pass
244+
else:
245+
self.check_fun(testfunc, targfunc, 'arr_date', **kwargs)
246+
objs += [self.arr_date.astype('O')]
247+
try:
248+
targfunc(self.arr_tdelta)
249+
except TypeError:
250+
pass
251+
else:
252+
self.check_fun(testfunc, targfunc, 'arr_tdelta', **kwargs)
253+
objs += [self.arr_tdelta.astype('O')]
244254

245255
if allow_obj:
246256
self.arr_obj = np.vstack(objs)

0 commit comments

Comments
 (0)