Skip to content

Commit a76693e

Browse files
dcheriankeewis
andauthored
Revert "[revert] test with Xarray PR branch" (#393)
* Revert "[revert] test with Xarray PR branch" This reverts commit 4a59ffa. * fix * one mroe * one more * fix typing * Use xarray main instead --------- Co-authored-by: Justus Magin <[email protected]>
1 parent 119a58c commit a76693e

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
steps:
103103
- uses: actions/checkout@v4
104104
with:
105-
repository: "dcherian/xarray"
105+
repository: "pydata/xarray"
106106
fetch-depth: 0 # Fetch all history for all branches and tags.
107107
- name: Set up conda environment
108108
uses: mamba-org/setup-micromamba@v1
@@ -116,7 +116,6 @@ jobs:
116116
pint>=0.22
117117
- name: Install xarray
118118
run: |
119-
git checkout flox-preserve-dtype
120119
python -m pip install --no-deps .
121120
- name: Install upstream flox
122121
run: |

ci/env-numpy1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ dependencies:
2727
- numbagg>=0.3
2828
- hypothesis
2929
- pip:
30-
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
30+
- git+https://github.com/dcherian/xarray.git

ci/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ dependencies:
2727
- numbagg>=0.3
2828
- hypothesis
2929
- pip:
30-
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
30+
- git+https://github.com/dcherian/xarray.git

ci/no-dask.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ dependencies:
2222
- numba
2323
- numbagg>=0.3
2424
- pip:
25-
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
25+
- git+https://github.com/dcherian/xarray.git

ci/no-numba.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ dependencies:
1919
- pytest-pretty
2020
- pytest-xdist
2121
- syrupy
22-
- xarray
2322
- pre-commit
2423
- numpy_groupies>=0.9.19
2524
- pooch
2625
- toolz
26+
- pip:
27+
- git+https://github.com/dcherian/xarray.git

flox/aggregations.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ def size(self) -> int:
149149
class Aggregation:
150150
def __init__(
151151
self,
152-
name,
152+
name: str,
153153
*,
154-
numpy: str | FuncTuple | None = None,
154+
numpy: str | None = None,
155155
chunk: str | FuncTuple | None,
156156
combine: str | FuncTuple | None,
157157
preprocess: Callable | None = None,
@@ -217,7 +217,7 @@ def __init__(
217217
self.preprocess = preprocess
218218
# Use "chunk_reduce" or "chunk_argreduce"
219219
self.reduction_type = reduction_type
220-
self.numpy: FuncTuple = (numpy,) if numpy else (self.name,)
220+
self.numpy: FuncTuple = (numpy,) if numpy is not None else (self.name,)
221221
# initialize blockwise reduction
222222
self.chunk: OptionalFuncTuple = _atleast_1d(chunk)
223223
# how to aggregate results after first round of reduction

0 commit comments

Comments
 (0)