Skip to content

Commit 8fba225

Browse files
committed
CLN: Remove TIMEZONE_IDS altogether
1 parent fc3400e commit 8fba225

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

pandas/conftest.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import pytest
1010
from pytz import FixedOffset, utc
1111

12-
import pandas.util._test_decorators as td
13-
1412
import pandas as pd
1513

1614
hypothesis.settings.register_profile(
@@ -376,24 +374,20 @@ def unique_nulls_fixture(request):
376374
FixedOffset(0), FixedOffset(-300), timezone.utc,
377375
timezone(timedelta(hours=1)),
378376
timezone(timedelta(hours=-1), name='foo')]
379-
TIMEZONE_IDS = [str(i) if not i or isinstance(i, str)
380-
else repr(i) for i in TIMEZONES]
381377

382378

383-
@td.parametrize_fixture_doc(str(TIMEZONE_IDS))
384-
@pytest.fixture(params=TIMEZONES, ids=TIMEZONE_IDS)
379+
@pytest.fixture(params=TIMEZONES, ids=repr)
385380
def tz_naive_fixture(request):
386381
"""
387-
Fixture for trying timezones including default (None): {0}
382+
Fixture for trying timezones including default (None)
388383
"""
389384
return request.param
390385

391386

392-
@td.parametrize_fixture_doc(str(TIMEZONE_IDS[1:]))
393-
@pytest.fixture(params=TIMEZONES[1:], ids=TIMEZONE_IDS[1:])
387+
@pytest.fixture(params=TIMEZONES[1:], ids=repr)
394388
def tz_aware_fixture(request):
395389
"""
396-
Fixture for trying explicit timezones: {0}
390+
Fixture for trying explicit timezones
397391
"""
398392
return request.param
399393

0 commit comments

Comments
 (0)