units & deprecation merge (#3530)

Author: max-sixty

xarray/tests/test_units.py

@@ -1969,7 +1969,7 @@ def test_broadcast_equals(self, unit, dtype):
                 dim={"z": np.linspace(10, 20, 12) * unit_registry.s},
                 axis=1,
             ),
-            method("drop", labels="x"),
+            method("drop_sel", labels="x"),
             method("reset_coords", names="x2"),
             method("copy"),
             pytest.param(
@@ -4045,7 +4045,7 @@ def test_reindex_like(self, unit, error, dtype):
                 marks=pytest.mark.xfail(reason="strips units"),
             ),
             pytest.param(
-                method("apply", np.fabs),
+                method("map", np.fabs),
                 marks=pytest.mark.xfail(reason="fabs strips units"),
             ),
         ),
@@ -4220,7 +4220,7 @@ def test_grouped_operations(self, func, dtype):
             method("rename_dims", x="offset_x"),
             method("swap_dims", {"x": "x2"}),
             method("expand_dims", v=np.linspace(10, 20, 12) * unit_registry.s, axis=1),
-            method("drop", labels="x"),
+            method("drop_sel", labels="x"),
             method("drop_dims", "z"),
             method("set_coords", names="c"),
             method("reset_coords", names="x2"),