@@ -376,19 +376,25 @@ def unique_nulls_fixture(request):
376376 FixedOffset (0 ), FixedOffset (- 300 ), timezone .utc ,
377377 timezone (timedelta (hours = 1 )),
378378 timezone (timedelta (hours = - 1 ), name = 'foo' )]
379+ TIMEZONE_IDS = ['None' , 'UTC' , 'US/Eastern' , 'Asia/Tokyp' ,
380+ 'dateutil/US/Pacific' , 'dateutil/Asia/Singapore' ,
381+ 'dateutil.tz.tzutz()' , 'dateutil.tz.tzlocal()' ,
382+ 'pytz.FixedOffset(300)' , 'pytz.FixedOffset(0)' ,
383+ 'pytz.FixedOffset(-300)' , 'datetime.timezone.utc' ,
384+ 'datetime.timezone.+1' , 'datetime.timezone.-1.named' ]
379385
380386
381- @td .parametrize_fixture_doc (str (TIMEZONES ))
382- @pytest .fixture (params = TIMEZONES )
387+ @td .parametrize_fixture_doc (str (TIMEZONE_IDS ))
388+ @pytest .fixture (params = TIMEZONES , ids = TIMEZONE_IDS )
383389def tz_naive_fixture (request ):
384390 """
385391 Fixture for trying timezones including default (None): {0}
386392 """
387393 return request .param
388394
389395
390- @td .parametrize_fixture_doc (str (TIMEZONES [1 :]))
391- @pytest .fixture (params = TIMEZONES [1 :])
396+ @td .parametrize_fixture_doc (str (TIMEZONE_IDS [1 :]))
397+ @pytest .fixture (params = TIMEZONES [1 :], ids = TIMEZONE_IDS [ 1 :] )
392398def tz_aware_fixture (request ):
393399 """
394400 Fixture for trying explicit timezones: {0}
@@ -398,6 +404,8 @@ def tz_aware_fixture(request):
398404
399405# ----------------------------------------------------------------
400406# Dtypes
407+ # ----------------------------------------------------------------
408+
401409UNSIGNED_INT_DTYPES = ["uint8" , "uint16" , "uint32" , "uint64" ]
402410UNSIGNED_EA_INT_DTYPES = ["UInt8" , "UInt16" , "UInt32" , "UInt64" ]
403411SIGNED_INT_DTYPES = [int , "int8" , "int16" , "int32" , "int64" ]
@@ -409,16 +417,16 @@ def tz_aware_fixture(request):
409417COMPLEX_DTYPES = [complex , "complex64" , "complex128" ]
410418STRING_DTYPES = [str , 'str' , 'U' ]
411419
412- DATETIME_DTYPES = ['datetime64[ns]' , 'M8[ns]' ]
413- TIMEDELTA_DTYPES = ['timedelta64[ns]' , 'm8[ns]' ]
420+ DATETIME64_DTYPES = ['datetime64[ns]' , 'M8[ns]' ]
421+ TIMEDELTA64_DTYPES = ['timedelta64[ns]' , 'm8[ns]' ]
414422
415423BOOL_DTYPES = [bool , 'bool' ]
416424BYTES_DTYPES = [bytes , 'bytes' ]
417425OBJECT_DTYPES = [object , 'object' ]
418426
419427ALL_REAL_DTYPES = FLOAT_DTYPES + ALL_INT_DTYPES
420428ALL_NUMPY_DTYPES = (ALL_REAL_DTYPES + COMPLEX_DTYPES + STRING_DTYPES +
421- DATETIME_DTYPES + TIMEDELTA_DTYPES + BOOL_DTYPES +
429+ DATETIME64_DTYPES + TIMEDELTA64_DTYPES + BOOL_DTYPES +
422430 OBJECT_DTYPES + BYTES_DTYPES )
423431
424432
0 commit comments