File tree Expand file tree Collapse file tree 6 files changed +9
-9
lines changed Expand file tree Collapse file tree 6 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ jobs:
102
102
steps :
103
103
- uses : actions/checkout@v4
104
104
with :
105
- repository : " dcherian /xarray"
105
+ repository : " pydata /xarray"
106
106
fetch-depth : 0 # Fetch all history for all branches and tags.
107
107
- name : Set up conda environment
108
108
uses : mamba-org/setup-micromamba@v1
@@ -116,7 +116,6 @@ jobs:
116
116
pint>=0.22
117
117
- name : Install xarray
118
118
run : |
119
- git checkout flox-preserve-dtype
120
119
python -m pip install --no-deps .
121
120
- name : Install upstream flox
122
121
run : |
Original file line number Diff line number Diff line change @@ -27,4 +27,4 @@ dependencies:
27
27
- numbagg>=0.3
28
28
- hypothesis
29
29
- pip :
30
- - git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
30
+ - git+https://github.com/dcherian/xarray.git
Original file line number Diff line number Diff line change @@ -27,4 +27,4 @@ dependencies:
27
27
- numbagg>=0.3
28
28
- hypothesis
29
29
- pip :
30
- - git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
30
+ - git+https://github.com/dcherian/xarray.git
Original file line number Diff line number Diff line change @@ -22,4 +22,4 @@ dependencies:
22
22
- numba
23
23
- numbagg>=0.3
24
24
- pip :
25
- - git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
25
+ - git+https://github.com/dcherian/xarray.git
Original file line number Diff line number Diff line change @@ -19,8 +19,9 @@ dependencies:
19
19
- pytest-pretty
20
20
- pytest-xdist
21
21
- syrupy
22
- - xarray
23
22
- pre-commit
24
23
- numpy_groupies>=0.9.19
25
24
- pooch
26
25
- toolz
26
+ - pip :
27
+ - git+https://github.com/dcherian/xarray.git
Original file line number Diff line number Diff line change @@ -149,9 +149,9 @@ def size(self) -> int:
149
149
class Aggregation :
150
150
def __init__ (
151
151
self ,
152
- name ,
152
+ name : str ,
153
153
* ,
154
- numpy : str | FuncTuple | None = None ,
154
+ numpy : str | None = None ,
155
155
chunk : str | FuncTuple | None ,
156
156
combine : str | FuncTuple | None ,
157
157
preprocess : Callable | None = None ,
@@ -217,7 +217,7 @@ def __init__(
217
217
self .preprocess = preprocess
218
218
# Use "chunk_reduce" or "chunk_argreduce"
219
219
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 ,)
221
221
# initialize blockwise reduction
222
222
self .chunk : OptionalFuncTuple = _atleast_1d (chunk )
223
223
# how to aggregate results after first round of reduction
You can’t perform that action at this time.
0 commit comments