o repo hygiene plotting: hvplot in tests; zonal_average delegates to zonal_mean (xr.DataArray)

Author: rajeeja

test/test_plot.py

@@ -76,17 +76,19 @@ def test_dataarray_methods(gridpath, datasetpath):
     # plot.scatter() is an xarray method
     assert hasattr(uxds.plot, 'scatter')
 
+import hvplot.xarray  # registers .hvplot accessor
+
 def test_line(gridpath):
     mesh_path = gridpath("mpas", "QU", "oQU480.231010.nc")
     uxds = ux.open_dataset(mesh_path, mesh_path)
-    _plot_line = uxds['bottomDepth'].zonal_average().plot.line()
+    _plot_line = uxds['bottomDepth'].zonal_average().hvplot.line()
     assert isinstance(_plot_line, hv.Curve)
 
 def test_scatter(gridpath):
     mesh_path = gridpath("mpas", "QU", "oQU480.231010.nc")
     uxds = ux.open_dataset(mesh_path, mesh_path)
-    _plot_line = uxds['bottomDepth'].zonal_average().plot.scatter()
-    assert isinstance(_plot_line, hv.Scatter)
+    _plot_scatter = uxds['bottomDepth'].zonal_average().hvplot.scatter()
+    assert isinstance(_plot_scatter, hv.Scatter)
 
 
 

uxarray/core/dataarray.py

@@ -643,20 +643,8 @@ def zonal_mean(self, lat=(-90, 90, 10), conservative: bool = False, **kwargs):
             )
 
     def zonal_average(self, lat=(-90, 90, 10), conservative: bool = False, **kwargs):
-        """Zonal average convenience returning an object with the plotting accessor.
-
-        Returns a UxDataArray for compatibility with plotting tests while delegating
-        computation to zonal_mean.
-        """
-        da = self.zonal_mean(lat=lat, conservative=conservative, **kwargs)
-        return UxDataArray(
-            da.data,
-            uxgrid=self.uxgrid,
-            dims=list(da.dims),
-            coords=da.coords,
-            name=da.name,
-            attrs=da.attrs,
-        )
+        """Alias of zonal_mean; prefer `zonal_mean` for primary API."""
+        return self.zonal_mean(lat=lat, conservative=conservative, **kwargs)
 
     def weighted_mean(self, weights=None):
         """Computes a weighted mean.