From 6a330c52c2755e2bd9d3ba692889833ad40d6885 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Tue, 23 Nov 2021 21:28:16 -0800 Subject: [PATCH] CI: Remove duplicate skip windows decorators --- pandas/tests/indexes/datetimes/test_date_range.py | 2 +- pandas/tests/indexes/datetimes/test_setops.py | 2 +- pandas/tests/io/pytables/test_put.py | 2 +- pandas/tests/io/pytables/test_round_trip.py | 4 ++-- pandas/tests/scalar/timestamp/test_timestamp.py | 2 +- pandas/util/_test_decorators.py | 3 --- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pandas/tests/indexes/datetimes/test_date_range.py b/pandas/tests/indexes/datetimes/test_date_range.py index a99d2f590be97..377974a918ad9 100644 --- a/pandas/tests/indexes/datetimes/test_date_range.py +++ b/pandas/tests/indexes/datetimes/test_date_range.py @@ -94,7 +94,7 @@ def test_date_range_timestamp_equiv_explicit_pytz(self): ts = Timestamp("20090415", tz=pytz.timezone("US/Eastern")) assert ts == stamp - @td.skip_if_windows_python_3 + @td.skip_if_windows def test_date_range_timestamp_equiv_explicit_dateutil(self): from pandas._libs.tslibs.timezones import dateutil_gettz as gettz diff --git a/pandas/tests/indexes/datetimes/test_setops.py b/pandas/tests/indexes/datetimes/test_setops.py index 3201b038c624b..ae4ed04f8adac 100644 --- a/pandas/tests/indexes/datetimes/test_setops.py +++ b/pandas/tests/indexes/datetimes/test_setops.py @@ -515,7 +515,7 @@ def test_month_range_union_tz_pytz(self, sort): early_dr.union(late_dr, sort=sort) - @td.skip_if_windows_python_3 + @td.skip_if_windows def test_month_range_union_tz_dateutil(self, sort): from pandas._libs.tslibs.timezones import dateutil_gettz diff --git a/pandas/tests/io/pytables/test_put.py b/pandas/tests/io/pytables/test_put.py index f4b70bc6f238a..41addc5023436 100644 --- a/pandas/tests/io/pytables/test_put.py +++ b/pandas/tests/io/pytables/test_put.py @@ -176,7 +176,7 @@ def test_put_compression(setup_path): store.put("b", df, format="fixed", complib="zlib") -@td.skip_if_windows_python_3 +@td.skip_if_windows def test_put_compression_blosc(setup_path): df = tm.makeTimeDataFrame() diff --git a/pandas/tests/io/pytables/test_round_trip.py b/pandas/tests/io/pytables/test_round_trip.py index 97edc3cdffdf7..eba21bd94444a 100644 --- a/pandas/tests/io/pytables/test_round_trip.py +++ b/pandas/tests/io/pytables/test_round_trip.py @@ -354,7 +354,7 @@ def test_timeseries_preepoch(setup_path): @pytest.mark.parametrize( - "compression", [False, pytest.param(True, marks=td.skip_if_windows_python_3)] + "compression", [False, pytest.param(True, marks=td.skip_if_windows)] ) def test_frame(compression, setup_path): @@ -435,7 +435,7 @@ def test_store_hierarchical(setup_path): @pytest.mark.parametrize( - "compression", [False, pytest.param(True, marks=td.skip_if_windows_python_3)] + "compression", [False, pytest.param(True, marks=td.skip_if_windows)] ) def test_store_mixed(compression, setup_path): def _make_one(): diff --git a/pandas/tests/scalar/timestamp/test_timestamp.py b/pandas/tests/scalar/timestamp/test_timestamp.py index 214ad634e78da..b3abec6b9761f 100644 --- a/pandas/tests/scalar/timestamp/test_timestamp.py +++ b/pandas/tests/scalar/timestamp/test_timestamp.py @@ -579,7 +579,7 @@ def test_timestamp_to_datetime_explicit_pytz(self): assert stamp == dtval assert stamp.tzinfo == dtval.tzinfo - @td.skip_if_windows_python_3 + @td.skip_if_windows def test_timestamp_to_datetime_explicit_dateutil(self): stamp = Timestamp("20090415", tz=gettz("US/Eastern")) dtval = stamp.to_pydatetime() diff --git a/pandas/util/_test_decorators.py b/pandas/util/_test_decorators.py index 411f8537e76bd..f63212c777048 100644 --- a/pandas/util/_test_decorators.py +++ b/pandas/util/_test_decorators.py @@ -184,9 +184,6 @@ def skip_if_no(package: str, min_version: str | None = None): skip_if_mpl = pytest.mark.skipif(not _skip_if_no_mpl(), reason="matplotlib is present") skip_if_32bit = pytest.mark.skipif(not IS64, reason="skipping for 32 bit") skip_if_windows = pytest.mark.skipif(is_platform_windows(), reason="Running on Windows") -skip_if_windows_python_3 = pytest.mark.skipif( - is_platform_windows(), reason="not used on win32" -) skip_if_has_locale = pytest.mark.skipif( _skip_if_has_locale(), reason=f"Specific locale is set {locale.getlocale()[0]}" )