Merge branch 'main' into topk

* main:
  Bump codecov/codecov-action from 4.6.0 to 5.1.2 (#407)
  [pre-commit.ci] pre-commit autoupdate (#408)
  Back to Xarray release in CI (#414)
  Xfail some cubed tests (#413)

Author: dcherian

.github/workflows/ci-additional.yaml

@@ -77,7 +77,7 @@ jobs:
           --ignore flox/tests \
           --cov=./ --cov-report=xml
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: ./coverage.xml
           flags: unittests
@@ -132,7 +132,7 @@ jobs:
           python -m mypy --install-types --non-interactive --cache-dir=.mypy_cache/ --cobertura-xml-report mypy_report
 
       - name: Upload mypy coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: mypy_report/cobertura.xml
           flags: mypy

.github/workflows/ci.yaml

@@ -76,7 +76,7 @@ jobs:
           python -c "import xarray; xarray.show_versions()"
           pytest --durations=20 --durations-min=0.5 -n auto --cov=./ --cov-report=xml --hypothesis-profile ci
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: ./coverage.xml
           flags: unittests

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.6.9"
+    rev: "v0.9.1"
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -24,15 +24,15 @@ repos:
       - id: check-docstring-first
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
+    rev: 0.7.21
     hooks:
       - id: mdformat
         additional_dependencies:
           - mdformat-black
           - mdformat-myst
 
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.7.1
+    rev: 0.8.1
     hooks:
       - id: nbstripout
         args: [--extra-keys=metadata.kernelspec metadata.language_info.version]
@@ -45,12 +45,12 @@ repos:
           - tomli
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.20.2
+    rev: v0.23
     hooks:
       - id: validate-pyproject
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.6
     hooks:
       - id: actionlint
         files: ".github/workflows/"

ci/env-numpy1.yml

@@ -26,5 +26,4 @@ dependencies:
   - numba
   - numbagg>=0.3
   - hypothesis
-  - pip:
-      - git+https://github.com/dcherian/xarray.git
+  - xarray

ci/environment.yml

@@ -26,5 +26,5 @@ dependencies:
   - numba
   - numbagg>=0.3
   - hypothesis
-  - pip:
-      - git+https://github.com/dcherian/xarray.git
+  - xarray
+  - zarr<3 # unpin when cubed is fixed.

ci/no-dask.yml

@@ -21,5 +21,4 @@ dependencies:
   - toolz
   - numba
   - numbagg>=0.3
-  - pip:
-      - git+https://github.com/dcherian/xarray.git
+  - xarray

ci/no-numba.yml

@@ -23,5 +23,4 @@ dependencies:
   - numpy_groupies>=0.9.19
   - pooch
   - toolz
-  - pip:
-      - git+https://github.com/dcherian/xarray.git
+  - xarray

flox/core.py

@@ -1931,7 +1931,7 @@ def _groupby_combine(a, axis, dummy_axis, dtype, keepdims):
                 out[field] = combine(a[field], axis=dummy_axis, keepdims=keepdims)
             return out
 
-        def _groupby_aggregate(a):
+        def _groupby_aggregate(a, **kwargs):
             # Convert cubed dict to one that _finalize_results works with
             results = {"groups": expected_groups, "intermediates": a.values()}
             out = _finalize_results(results, agg, axis, expected_groups, reindex)
@@ -2372,8 +2372,7 @@ def groupby_reduce(
 
     if engine == "flox" and _is_arg_reduction(func):
         raise NotImplementedError(
-            "argreductions not supported for engine='flox' yet."
-            "Try engine='numpy' or engine='numba' instead."
+            "argreductions not supported for engine='flox' yet. Try engine='numpy' or engine='numba' instead."
         )
 
     if engine == "numbagg" and dtype is not None:

tests/__init__.py

@@ -66,9 +66,7 @@ def __init__(self, max_computes=0):
     def __call__(self, dsk, keys, **kwargs):
         self.total_computes += 1
         if self.total_computes > self.max_computes:
-            raise RuntimeError(
-                "Too many computes. Total: %d > max: %d." % (self.total_computes, self.max_computes)
-            )
+            raise RuntimeError(f"Too many computes. Total: {self.total_computes} > max: {self.max_computes}.")
         return dask.get(dsk, keys, **kwargs)
 
 

tests/test_core.py

@@ -1284,6 +1284,7 @@ def test_group_by_datetime(engine, method):
     assert_equal(expected, actual)
 
 
+@pytest.mark.xfail
 @requires_cubed
 @pytest.mark.parametrize("method", ["blockwise", "map-reduce"])
 def test_group_by_datetime_cubed(engine, method):