[skip-ci] Fix some asv benchmarks (#4920)

Mostly adjust to deprecated behaviour

Author: dcherian

asv_bench/benchmarks/combine.py

@@ -26,13 +26,13 @@ def setup(self):
             {"B": xr.DataArray(data, coords={"T": t + t_size}, dims=("T", "X", "Y"))}
         )
 
-    def time_combine_manual(self):
+    def time_combine_nested(self):
         datasets = [[self.dsA0, self.dsA1], [self.dsB0, self.dsB1]]
 
-        xr.combine_manual(datasets, concat_dim=[None, "t"])
+        xr.combine_nested(datasets, concat_dim=[None, "T"])
 
-    def time_auto_combine(self):
+    def time_combine_by_coords(self):
         """Also has to load and arrange t coordinate"""
         datasets = [self.dsA0, self.dsA1, self.dsB0, self.dsB1]
 
-        xr.combine_auto(datasets)
+        xr.combine_by_coords(datasets)

asv_bench/benchmarks/dataset_io.py

@@ -59,23 +59,20 @@ def make_ds(self):
             coords={"lon": lons, "lat": lats, "time": times},
             dims=("time", "lon", "lat"),
             name="foo",
-            encoding=None,
             attrs={"units": "foo units", "description": "a description"},
         )
         self.ds["bar"] = xr.DataArray(
             randn((self.nt, self.nx, self.ny), frac_nan=0.2),
             coords={"lon": lons, "lat": lats, "time": times},
             dims=("time", "lon", "lat"),
             name="bar",
-            encoding=None,
             attrs={"units": "bar units", "description": "a description"},
         )
         self.ds["baz"] = xr.DataArray(
             randn((self.nx, self.ny), frac_nan=0.2).astype(np.float32),
             coords={"lon": lons, "lat": lats},
             dims=("lon", "lat"),
             name="baz",
-            encoding=None,
             attrs={"units": "baz units", "description": "a description"},
         )
 
@@ -270,23 +267,20 @@ def make_ds(self, nfiles=10):
                 coords={"lon": lons, "lat": lats, "time": times},
                 dims=("time", "lon", "lat"),
                 name="foo",
-                encoding=None,
                 attrs={"units": "foo units", "description": "a description"},
             )
             ds["bar"] = xr.DataArray(
                 randn((nt, self.nx, self.ny), frac_nan=0.2),
                 coords={"lon": lons, "lat": lats, "time": times},
                 dims=("time", "lon", "lat"),
                 name="bar",
-                encoding=None,
                 attrs={"units": "bar units", "description": "a description"},
             )
             ds["baz"] = xr.DataArray(
                 randn((self.nx, self.ny), frac_nan=0.2).astype(np.float32),
                 coords={"lon": lons, "lat": lats},
                 dims=("lon", "lat"),
                 name="baz",
-                encoding=None,
                 attrs={"units": "baz units", "description": "a description"},
             )
 

asv_bench/benchmarks/repr.py

@@ -4,7 +4,7 @@
 
 
 class ReprMultiIndex:
-    def setup(self, key):
+    def setup(self):
         index = pd.MultiIndex.from_product(
             [range(10000), range(10000)], names=("level_0", "level_1")
         )