Merge pull request #1375 from xylar/fix-test-warnings

lee1043 · web-flow · commit 28bc4d545ed9 · 2026-05-07T08:51:36.000-07:00
Fix warnings in unit tests
diff --git a/pcmdi_metrics/enso/lib/summary_plot_lib/plot.py b/pcmdi_metrics/enso/lib/summary_plot_lib/plot.py
@@ -1016,7 +1016,7 @@ def multiportraitplot(
         aspect=40,
     )
     cbar.ax.set_yticklabels(
-        ["-2 $\sigma$", "-1", "MMV", "1", "2 $\sigma$"], fontdict=fontdict  # noqa
+        [r"-2 $\sigma$", "-1", "MMV", "1", r"2 $\sigma$"], fontdict=fontdict  # noqa
     )
     dict_arrow = dict(facecolor="k", width=8, headwidth=40, headlength=40, shrink=0.0)
     dict_txt = dict(fontsize=40, rotation="vertical", ha="center", weight="bold")
diff --git a/tests/test_drcdm.py b/tests/test_drcdm.py
@@ -7,11 +7,12 @@
 
 def create_random_precip(years, max_val=None, min_val=None):
     # Returns array of precip along with sftlf
-    times = xr.cftime_range(
+    times = xr.date_range(
         start="{0}-01-01".format(years[0]),
         end="{0}-12-31".format(years[1]),
         freq="D",
         calendar="noleap",
+        use_cftime=True,
         name="time",
     )
     latd = 2
@@ -36,6 +37,7 @@ def create_random_precip(years, max_val=None, min_val=None):
 
     fake_ds["time"].encoding["calendar"] = "noleap"
     fake_ds["time"].encoding["units"] = "days since 0000-01-01"
+    fake_ds["lat"].attrs["units"] = "degrees_north"
     fake_ds = fake_ds.bounds.add_missing_bounds()
 
     if max_val is not None:
@@ -55,6 +57,7 @@ def create_random_precip(years, max_val=None, min_val=None):
             )
         }
     )
+    sftlf["lat"].attrs["units"] = "degrees_north"
     sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])
 
     return fake_ds, sftlf
@@ -66,11 +69,12 @@ def create_seasonal_precip(season):
     mos = sd[season]
 
     years = [1980, 1981]
-    times = xr.cftime_range(
+    times = xr.date_range(
         start="{0}-01-01".format(years[0]),
         end="{0}-12-31".format(years[1]),
         freq="D",
         calendar="noleap",
+        use_cftime=True,
         name="time",
     )
     latd = 2
@@ -99,6 +103,7 @@ def create_seasonal_precip(season):
     )
     fake_ds["time"].encoding["calendar"] = "noleap"
     fake_ds["time"].encoding["units"] = "days since 0000-01-01"
+    fake_ds["lat"].attrs["units"] = "degrees_north"
     fake_ds = fake_ds.bounds.add_missing_bounds()
 
     sftlf_arr = np.ones((latd, lond))
@@ -113,6 +118,7 @@ def create_seasonal_precip(season):
             )
         }
     )
+    sftlf["lat"].attrs["units"] = "degrees_north"
     sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])
 
     return fake_ds, sftlf
diff --git a/tests/test_extremes.py b/tests/test_extremes.py
@@ -6,11 +6,12 @@
 
 def create_random_precip(years, max_val=None, min_val=None):
     # Returns array of precip along with covariate and sftlf
-    times = xr.cftime_range(
+    times = xr.date_range(
         start="{0}-01-01".format(years[0]),
         end="{0}-12-31".format(years[1]),
         freq="D",
         calendar="noleap",
+        use_cftime=True,
         name="time",
     )
     latd = 2
@@ -48,6 +49,7 @@ def create_random_precip(years, max_val=None, min_val=None):
 
     fake_ds["time"].encoding["calendar"] = "noleap"
     fake_ds["time"].encoding["units"] = "days since 0000-01-01"
+    fake_ds["lat"].attrs["units"] = "degrees_north"
     fake_ds = fake_ds.bounds.add_missing_bounds()
 
     if max_val is not None:
@@ -67,6 +69,7 @@ def create_random_precip(years, max_val=None, min_val=None):
             )
         }
     )
+    sftlf["lat"].attrs["units"] = "degrees_north"
     sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])
 
     return fake_ds, fake_cov, sftlf
@@ -78,11 +81,12 @@ def create_seasonal_precip(season):
     mos = sd[season]
 
     years = [1980, 1981]
-    times = xr.cftime_range(
+    times = xr.date_range(
         start="{0}-01-01".format(years[0]),
         end="{0}-12-31".format(years[1]),
         freq="D",
         calendar="noleap",
+        use_cftime=True,
         name="time",
     )
     latd = 2
@@ -111,6 +115,7 @@ def create_seasonal_precip(season):
     )
     fake_ds["time"].encoding["calendar"] = "noleap"
     fake_ds["time"].encoding["units"] = "days since 0000-01-01"
+    fake_ds["lat"].attrs["units"] = "degrees_north"
     fake_ds = fake_ds.bounds.add_missing_bounds()
 
     sftlf_arr = np.ones((latd, lond)) * 100
@@ -125,6 +130,7 @@ def create_seasonal_precip(season):
             )
         }
     )
+    sftlf["lat"].attrs["units"] = "degrees_north"
     sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])
 
     return fake_ds, sftlf
diff --git a/tests/test_qc.py b/tests/test_qc.py
@@ -13,8 +13,8 @@
 @pytest.fixture
 def create_dataset():
     def _create_dataset(start_date, periods, freq, calendar="gregorian"):
-        dates = xr.cftime_range(
-            start_date, periods=periods, freq=freq, calendar=calendar
+        dates = xr.date_range(
+            start_date, periods=periods, freq=freq, calendar=calendar, use_cftime=True
         )
         return xr.Dataset({"time": dates})
 
@@ -50,13 +50,13 @@ def test_check_daily_time_axis_missing_time_key(create_dataset):
 # Test check_monthly_time_axis
 @pytest.mark.parametrize("calendar", ["gregorian", "noleap", "360_day"])
 def test_check_monthly_time_axis_correct(create_dataset, calendar):
-    ds = create_dataset("2000-01-01", 24, "M", calendar=calendar)
+    ds = create_dataset("2000-01-01", 24, "ME", calendar=calendar)
     assert check_monthly_time_axis(ds) is None
 
 
 def test_check_monthly_time_axis_incorrect(create_dataset):
     # Test with incorrect monthly sequence
-    ds = create_dataset("2000-01-01", 24, "2M")
+    ds = create_dataset("2000-01-01", 24, "2ME")
     with pytest.raises(ValueError, match="DATA ERROR: time is not correct!"):
         check_monthly_time_axis(ds)
 
@@ -68,7 +68,7 @@ def test_check_monthly_time_axis_non_datetime():
 
 
 def test_check_monthly_time_axis_missing_time_key(create_dataset):
-    ds = create_dataset("2000-01-01", 24, "M")
+    ds = create_dataset("2000-01-01", 24, "ME")
     with pytest.raises(KeyError):
         check_monthly_time_axis(ds, time_key="non_existent_key")
 
diff --git a/tests/test_sea_ice.py b/tests/test_sea_ice.py
@@ -6,11 +6,12 @@
 
 def create_fake_sea_ice_ds():
     years = [1980, 1999]
-    times = xr.cftime_range(
+    times = xr.date_range(
         start="{0}-01-01".format(years[0]),
         end="{0}-12-31".format(years[1]),
         freq="ME",
         calendar="noleap",
+        use_cftime=True,
         name="time",
     )
     latd = 2

Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,7 @@ def multiportraitplot(`
`1016`	`1016`	`aspect=40,`
`1017`	`1017`	`)`
`1018`	`1018`	`cbar.ax.set_yticklabels(`
`1019`		`- ["-2 $\sigma$", "-1", "MMV", "1", "2 $\sigma$"], fontdict=fontdict # noqa`
	`1019`	`+ [r"-2 $\sigma$", "-1", "MMV", "1", r"2 $\sigma$"], fontdict=fontdict # noqa`
`1020`	`1020`	`)`
`1021`	`1021`	`dict_arrow = dict(facecolor="k", width=8, headwidth=40, headlength=40, shrink=0.0)`
`1022`	`1022`	`dict_txt = dict(fontsize=40, rotation="vertical", ha="center", weight="bold")`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,12 @@`
`7`	`7`
`8`	`8`	`def create_random_precip(years, max_val=None, min_val=None):`
`9`	`9`	`# Returns array of precip along with sftlf`
`10`		`- times = xr.cftime_range(`
	`10`	`+ times = xr.date_range(`
`11`	`11`	`start="{0}-01-01".format(years[0]),`
`12`	`12`	`end="{0}-12-31".format(years[1]),`
`13`	`13`	`freq="D",`
`14`	`14`	`calendar="noleap",`
	`15`	`+ use_cftime=True,`
`15`	`16`	`name="time",`
`16`	`17`	`)`
`17`	`18`	`latd = 2`
`@@ -36,6 +37,7 @@ def create_random_precip(years, max_val=None, min_val=None):`
`36`	`37`
`37`	`38`	`fake_ds["time"].encoding["calendar"] = "noleap"`
`38`	`39`	`fake_ds["time"].encoding["units"] = "days since 0000-01-01"`
	`40`	`+ fake_ds["lat"].attrs["units"] = "degrees_north"`
`39`	`41`	`fake_ds = fake_ds.bounds.add_missing_bounds()`
`40`	`42`
`41`	`43`	`if max_val is not None:`
`@@ -55,6 +57,7 @@ def create_random_precip(years, max_val=None, min_val=None):`
`55`	`57`	`)`
`56`	`58`	`}`
`57`	`59`	`)`
	`60`	`+ sftlf["lat"].attrs["units"] = "degrees_north"`
`58`	`61`	`sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])`
`59`	`62`
`60`	`63`	`return fake_ds, sftlf`
`@@ -66,11 +69,12 @@ def create_seasonal_precip(season):`
`66`	`69`	`mos = sd[season]`
`67`	`70`
`68`	`71`	`years = [1980, 1981]`
`69`		`- times = xr.cftime_range(`
	`72`	`+ times = xr.date_range(`
`70`	`73`	`start="{0}-01-01".format(years[0]),`
`71`	`74`	`end="{0}-12-31".format(years[1]),`
`72`	`75`	`freq="D",`
`73`	`76`	`calendar="noleap",`
	`77`	`+ use_cftime=True,`
`74`	`78`	`name="time",`
`75`	`79`	`)`
`76`	`80`	`latd = 2`
`@@ -99,6 +103,7 @@ def create_seasonal_precip(season):`
`99`	`103`	`)`
`100`	`104`	`fake_ds["time"].encoding["calendar"] = "noleap"`
`101`	`105`	`fake_ds["time"].encoding["units"] = "days since 0000-01-01"`
	`106`	`+ fake_ds["lat"].attrs["units"] = "degrees_north"`
`102`	`107`	`fake_ds = fake_ds.bounds.add_missing_bounds()`
`103`	`108`
`104`	`109`	`sftlf_arr = np.ones((latd, lond))`
`@@ -113,6 +118,7 @@ def create_seasonal_precip(season):`
`113`	`118`	`)`
`114`	`119`	`}`
`115`	`120`	`)`
	`121`	`+ sftlf["lat"].attrs["units"] = "degrees_north"`
`116`	`122`	`sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])`
`117`	`123`
`118`	`124`	`return fake_ds, sftlf`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,12 @@`
`6`	`6`
`7`	`7`	`def create_random_precip(years, max_val=None, min_val=None):`
`8`	`8`	`# Returns array of precip along with covariate and sftlf`
`9`		`- times = xr.cftime_range(`
	`9`	`+ times = xr.date_range(`
`10`	`10`	`start="{0}-01-01".format(years[0]),`
`11`	`11`	`end="{0}-12-31".format(years[1]),`
`12`	`12`	`freq="D",`
`13`	`13`	`calendar="noleap",`
	`14`	`+ use_cftime=True,`
`14`	`15`	`name="time",`
`15`	`16`	`)`
`16`	`17`	`latd = 2`
`@@ -48,6 +49,7 @@ def create_random_precip(years, max_val=None, min_val=None):`
`48`	`49`
`49`	`50`	`fake_ds["time"].encoding["calendar"] = "noleap"`
`50`	`51`	`fake_ds["time"].encoding["units"] = "days since 0000-01-01"`
	`52`	`+ fake_ds["lat"].attrs["units"] = "degrees_north"`
`51`	`53`	`fake_ds = fake_ds.bounds.add_missing_bounds()`
`52`	`54`
`53`	`55`	`if max_val is not None:`
`@@ -67,6 +69,7 @@ def create_random_precip(years, max_val=None, min_val=None):`
`67`	`69`	`)`
`68`	`70`	`}`
`69`	`71`	`)`
	`72`	`+ sftlf["lat"].attrs["units"] = "degrees_north"`
`70`	`73`	`sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])`
`71`	`74`
`72`	`75`	`return fake_ds, fake_cov, sftlf`
`@@ -78,11 +81,12 @@ def create_seasonal_precip(season):`
`78`	`81`	`mos = sd[season]`
`79`	`82`
`80`	`83`	`years = [1980, 1981]`
`81`		`- times = xr.cftime_range(`
	`84`	`+ times = xr.date_range(`
`82`	`85`	`start="{0}-01-01".format(years[0]),`
`83`	`86`	`end="{0}-12-31".format(years[1]),`
`84`	`87`	`freq="D",`
`85`	`88`	`calendar="noleap",`
	`89`	`+ use_cftime=True,`
`86`	`90`	`name="time",`
`87`	`91`	`)`
`88`	`92`	`latd = 2`
`@@ -111,6 +115,7 @@ def create_seasonal_precip(season):`
`111`	`115`	`)`
`112`	`116`	`fake_ds["time"].encoding["calendar"] = "noleap"`
`113`	`117`	`fake_ds["time"].encoding["units"] = "days since 0000-01-01"`
	`118`	`+ fake_ds["lat"].attrs["units"] = "degrees_north"`
`114`	`119`	`fake_ds = fake_ds.bounds.add_missing_bounds()`
`115`	`120`
`116`	`121`	`sftlf_arr = np.ones((latd, lond)) * 100`
`@@ -125,6 +130,7 @@ def create_seasonal_precip(season):`
`125`	`130`	`)`
`126`	`131`	`}`
`127`	`132`	`)`
	`133`	`+ sftlf["lat"].attrs["units"] = "degrees_north"`
`128`	`134`	`sftlf = sftlf.bounds.add_missing_bounds(["X", "Y"])`
`129`	`135`
`130`	`136`	`return fake_ds, sftlf`