Redo calendar fixtures

Author: dcherian

xarray/tests/__init__.py

@@ -16,6 +16,7 @@
 
 import xarray.testing
 from xarray import Dataset
+from xarray.coding.times import _STANDARD_CALENDARS as _STANDARD_CALENDARS_UNSORTED
 from xarray.core.duck_array_ops import allclose_or_equiv  # noqa: F401
 from xarray.core.extension_array import PandasExtensionArray
 from xarray.core.options import set_options
@@ -353,12 +354,33 @@ def create_test_data(
 
 
 _CFTIME_CALENDARS = [
-    "365_day",
-    "360_day",
-    "julian",
-    "all_leap",
-    "366_day",
-    "gregorian",
-    "proleptic_gregorian",
-    "standard",
+    pytest.param(
+        cal, marks=pytest.mark.skipif(not has_cftime, reason="requires cftime")
+    )
+    for cal in [
+        "365_day",
+        "360_day",
+        "julian",
+        "all_leap",
+        "366_day",
+        "gregorian",
+        "proleptic_gregorian",
+        "standard",
+    ]
+]
+
+_NON_STANDARD_CALENDARS = [
+    pytest.param(
+        cal, marks=pytest.mark.skipif(not has_cftime, reason="requires cftime")
+    )
+    for cal in [
+        "noleap",
+        "365_day",
+        "360_day",
+        "julian",
+        "all_leap",
+        "366_day",
+    ]
 ]
+_STANDARD_CALENDARS = sorted(_STANDARD_CALENDARS_UNSORTED)
+_ALL_CALENDARS = _STANDARD_CALENDARS + _NON_STANDARD_CALENDARS

xarray/tests/test_accessor_dt.py

@@ -6,6 +6,7 @@
 
 import xarray as xr
 from xarray.tests import (
+    _CFTIME_CALENDARS,
     assert_allclose,
     assert_array_equal,
     assert_chunks_equal,
@@ -390,15 +391,6 @@ def test_dask_accessor_method(self, method, parameters) -> None:
         assert_equal(actual.compute(), expected.compute())
 
 
-_CFTIME_CALENDARS = [
-    "365_day",
-    "360_day",
-    "julian",
-    "all_leap",
-    "366_day",
-    "gregorian",
-    "proleptic_gregorian",
-]
 _NT = 100
 
 

xarray/tests/test_coding_times.py

@@ -19,7 +19,6 @@
     date_range,
     decode_cf,
 )
-from xarray.coding.times import _STANDARD_CALENDARS as _STANDARD_CALENDARS_UNSORTED
 from xarray.coding.times import (
     CFDatetimeCoder,
     _encode_datetime_with_cftime,
@@ -42,6 +41,9 @@
 from xarray.core.utils import is_duck_dask_array
 from xarray.testing import assert_equal, assert_identical
 from xarray.tests import (
+    _ALL_CALENDARS,
+    _NON_STANDARD_CALENDARS,
+    _STANDARD_CALENDARS,
     FirstElementAccessibleArray,
     arm_xfail,
     assert_array_equal,
@@ -53,17 +55,6 @@
     requires_dask,
 )
 
-_NON_STANDARD_CALENDARS_SET = {
-    "noleap",
-    "365_day",
-    "360_day",
-    "julian",
-    "all_leap",
-    "366_day",
-}
-_STANDARD_CALENDARS = sorted(_STANDARD_CALENDARS_UNSORTED)
-_ALL_CALENDARS = sorted(_NON_STANDARD_CALENDARS_SET.union(_STANDARD_CALENDARS))
-_NON_STANDARD_CALENDARS = sorted(_NON_STANDARD_CALENDARS_SET)
 _CF_DATETIME_NUM_DATES_UNITS = [
     (np.arange(10), "days since 2000-01-01"),
     (np.arange(10).astype("float64"), "days since 2000-01-01"),