@@ -290,8 +290,18 @@ def test_sum_2d_skipna_false(self):
290
290
)._values
291
291
tm .assert_timedelta_array_equal (result , expected )
292
292
293
- def test_std (self ):
294
- tdi = pd .TimedeltaIndex (["0H" , "4H" , "NaT" , "4H" , "0H" , "2H" ])
293
+ # Adding a Timestamp makes this a test for DatetimeArray.std
294
+ @pytest .mark .parametrize (
295
+ "add" ,
296
+ [
297
+ pd .Timedelta (0 ),
298
+ pd .Timestamp .now (),
299
+ pd .Timestamp .now ("UTC" ),
300
+ pd .Timestamp .now ("Asia/Tokyo" ),
301
+ ],
302
+ )
303
+ def test_std (self , add ):
304
+ tdi = pd .TimedeltaIndex (["0H" , "4H" , "NaT" , "4H" , "0H" , "2H" ]) + add
295
305
arr = tdi .array
296
306
297
307
result = arr .std (skipna = True )
@@ -303,18 +313,20 @@ def test_std(self):
303
313
assert isinstance (result , pd .Timedelta )
304
314
assert result == expected
305
315
306
- result = nanops .nanstd (np .asarray (arr ), skipna = True )
307
- assert isinstance (result , pd .Timedelta )
308
- assert result == expected
316
+ if getattr (arr , "tz" , None ) is None :
317
+ result = nanops .nanstd (np .asarray (arr ), skipna = True )
318
+ assert isinstance (result , pd .Timedelta )
319
+ assert result == expected
309
320
310
321
result = arr .std (skipna = False )
311
322
assert result is pd .NaT
312
323
313
324
result = tdi .std (skipna = False )
314
325
assert result is pd .NaT
315
326
316
- result = nanops .nanstd (np .asarray (arr ), skipna = False )
317
- assert result is pd .NaT
327
+ if getattr (arr , "tz" , None ) is None :
328
+ result = nanops .nanstd (np .asarray (arr ), skipna = False )
329
+ assert result is pd .NaT
318
330
319
331
def test_median (self ):
320
332
tdi = pd .TimedeltaIndex (["0H" , "3H" , "NaT" , "5H06m" , "0H" , "2H" ])
0 commit comments