Merge branch 'main' into topk

Author: dcherian

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)

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):