Skip to content

Commit 14b8120

Browse files
committed
Fix fixture
1 parent c5bfe92 commit 14b8120

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pandas/conftest.py

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ def compression_no_zip(request):
9696

9797

9898
@pytest.fixture(scope='module')
99-
@pytest.mark.skipif(not pandas.compat.PY3)
10099
def datetime_tz_utc():
101100
from datetime import timezone
102101
return timezone.utc

pandas/tests/indexes/datetimes/test_timezones.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import pandas as pd
1818
from pandas._libs import tslib
1919
from pandas._libs.tslibs import timezones
20-
from pandas.compat import lrange, zip
20+
from pandas.compat import lrange, zip, PY3
2121
from pandas import (DatetimeIndex, date_range, bdate_range,
2222
Timestamp, isna, to_datetime, Index)
2323

@@ -952,6 +952,7 @@ def test_dti_union_aware(self):
952952
@pytest.mark.parametrize('tz', [None, 'UTC', "US/Central",
953953
dateutil.tz.tzoffset(None, -28800)])
954954
@pytest.mark.usefixtures("datetime_tz_utc")
955+
@pytest.mark.skipif(not PY3, reason="datetime.timezone not in PY2")
955956
def test_iteration_preserves_nanoseconds(self, tz):
956957
# GH 19603
957958
index = DatetimeIndex(["2018-02-08 15:00:00.168456358",

0 commit comments

Comments
 (0)