Skip to content

Commit 71679c0

Browse files
committed
Fix test-skipping logic and remove 'dummy' from warning
1 parent 05f9398 commit 71679c0

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

xarray/coding/times.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def decode_cf_datetime(num_dates, units, calendar=None, use_cftime=None):
183183
if calendar in _STANDARD_CALENDARS:
184184
warnings.warn(
185185
'Unable to decode time axis into full '
186-
'numpy.datetime64 objects, continuing using dummy '
186+
'numpy.datetime64 objects, continuing using '
187187
'cftime.datetime objects instead, reason: dates out '
188188
'of range', SerializationWarning, stacklevel=3)
189189
else:

xarray/tests/test_backends.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3467,6 +3467,7 @@ def test_source_encoding_always_present():
34673467
assert ds.encoding['source'] == tmp
34683468

34693469

3470+
@requires_scipy_or_netCDF4
34703471
@pytest.mark.parametrize('calendar', _STANDARD_CALENDARS)
34713472
def test_use_cftime_standard_calendar_default_in_range(calendar):
34723473
x = [0, 1]
@@ -3497,6 +3498,7 @@ def test_use_cftime_standard_calendar_default_in_range(calendar):
34973498

34983499

34993500
@requires_cftime
3501+
@requires_scipy_or_netCDF4
35003502
@pytest.mark.parametrize('calendar', _STANDARD_CALENDARS)
35013503
@pytest.mark.parametrize('units_year', [1500, 2500])
35023504
def test_use_cftime_standard_calendar_default_out_of_range(
@@ -3530,6 +3532,7 @@ def test_use_cftime_standard_calendar_default_out_of_range(
35303532

35313533

35323534
@requires_cftime
3535+
@requires_scipy_or_netCDF4
35333536
@pytest.mark.parametrize('calendar', _ALL_CALENDARS)
35343537
@pytest.mark.parametrize('units_year', [1500, 2000, 2500])
35353538
def test_use_cftime_true(
@@ -3563,6 +3566,7 @@ def test_use_cftime_true(
35633566
assert not record
35643567

35653568

3569+
@requires_scipy_or_netCDF4
35663570
@pytest.mark.parametrize('calendar', _STANDARD_CALENDARS)
35673571
def test_use_cftime_false_standard_calendar_in_range(calendar):
35683572
x = [0, 1]
@@ -3592,6 +3596,7 @@ def test_use_cftime_false_standard_calendar_in_range(calendar):
35923596
assert not record
35933597

35943598

3599+
@requires_scipy_or_netCDF4
35953600
@pytest.mark.parametrize('calendar', _STANDARD_CALENDARS)
35963601
@pytest.mark.parametrize('units_year', [1500, 2500])
35973602
def test_use_cftime_false_standard_calendar_out_of_range(calendar, units_year):
@@ -3610,6 +3615,7 @@ def test_use_cftime_false_standard_calendar_out_of_range(calendar, units_year):
36103615
open_dataset(tmp_file, use_cftime=False)
36113616

36123617

3618+
@requires_scipy_or_netCDF4
36133619
@pytest.mark.parametrize('calendar', _NON_STANDARD_CALENDARS)
36143620
@pytest.mark.parametrize('units_year', [1500, 2000, 2500])
36153621
def test_use_cftime_false_nonstandard_calendar(calendar, units_year):

0 commit comments

Comments
 (0)