Merge branch 'main' into groupby-save-codes-new

Author: dcherian

.github/workflows/pypi-release.yaml

@@ -72,7 +72,7 @@ jobs:
 
       - name: Publish package to TestPyPI
         if: github.event_name == 'push'
-        uses: pypa/gh-action-pypi-publish@v1.6.4
+        uses: pypa/gh-action-pypi-publish@v1.7.1
         with:
           user: __token__
           password: ${{ secrets.TESTPYPI_TOKEN }}
@@ -90,7 +90,7 @@ jobs:
           name: releases
           path: dist
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.6.4
+        uses: pypa/gh-action-pypi-publish@v1.7.1
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/testpypi-release.yaml

@@ -78,7 +78,7 @@ jobs:
 
       - name: Publish package to TestPyPI
         if: github.event_name == 'push'
-        uses: pypa/gh-action-pypi-publish@v1.6.4
+        uses: pypa/gh-action-pypi-publish@v1.7.1
         with:
           user: __token__
           password: ${{ secrets.TESTPYPI_TOKEN }}

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
         files: ^xarray/
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.0.253'
+    rev: 'v0.0.254'
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -34,7 +34,7 @@ repos:
         additional_dependencies: ["black==23.1.0"]
       - id: blackdoc-autoupdate-black
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.0.1
+    rev: v1.1.1
     hooks:
       - id: mypy
         # Copied from setup.cfg

asv_bench/benchmarks/groupby.py

@@ -34,17 +34,17 @@ def time_agg_large_num_groups(self, method, ndim):
         ds = getattr(self, f"ds{ndim}d")
         getattr(ds.groupby("b"), method)()
 
-    def time_groupby_binary_op_1d(self):
-        self.ds1d - self.ds1d_mean
+    def time_binary_op_1d(self):
+        self.ds1d.groupby("b") - self.ds1d_mean
 
-    def time_groupby_binary_op_2d(self):
-        self.ds2d - self.ds2d_mean
+    def time_binary_op_2d(self):
+        self.ds2d.groupby("b") - self.ds2d_mean
 
-    def peakmem_groupby_binary_op_1d(self):
-        self.ds1d - self.ds1d_mean
+    def peakmem_binary_op_1d(self):
+        self.ds1d.groupby("b") - self.ds1d_mean
 
-    def peakmem_groupby_binary_op_2d(self):
-        self.ds2d - self.ds2d_mean
+    def peakmem_binary_op_2d(self):
+        self.ds2d.groupby("b") - self.ds2d_mean
 
 
 class GroupByDask(GroupBy):
@@ -71,10 +71,10 @@ def setup(self, *args, **kwargs):
         self.ds1d = self.ds1d.to_dataframe()
         self.ds1d_mean = self.ds1d.groupby("b").mean()
 
-    def time_groupby_binary_op_2d(self):
+    def time_binary_op_2d(self):
         raise NotImplementedError
 
-    def peakmem_groupby_binary_op_2d(self):
+    def peakmem_binary_op_2d(self):
         raise NotImplementedError
 
 
@@ -90,10 +90,10 @@ def setup(self, *args, **kwargs):
         self.ds1d = self.ds1d.chunk({"dim_0": 50}).to_dataframe()
         self.ds1d_mean = self.ds1d.groupby("b").mean()
 
-    def time_groupby_binary_op_2d(self):
+    def time_binary_op_2d(self):
         raise NotImplementedError
 
-    def peakmem_groupby_binary_op_2d(self):
+    def peakmem_binary_op_2d(self):
         raise NotImplementedError
 
 
@@ -123,18 +123,6 @@ def time_agg_large_num_groups(self, method, ndim):
         ds = getattr(self, f"ds{ndim}d")
         getattr(ds.resample(time="48H"), method)()
 
-    def time_groupby_binary_op_1d(self):
-        self.ds1d - self.ds1d_mean
-
-    def time_groupby_binary_op_2d(self):
-        self.ds2d - self.ds2d_mean
-
-    def peakmem_groupby_binary_op_1d(self):
-        self.ds1d - self.ds1d_mean
-
-    def peakmem_groupby_binary_op_2d(self):
-        self.ds2d - self.ds2d_mean
-
 
 class ResampleDask(Resample):
     def setup(self, *args, **kwargs):

ci/requirements/doc.yml

@@ -23,6 +23,7 @@ dependencies:
   - pandas>=1.4
   - pooch
   - pip
+  - pre-commit
   - pyproj
   - rasterio>=1.1
   - scipy!=1.10.0