Skip to content

Commit

Permalink
Revert "[revert] test with Xarray PR branch" (xarray-contrib#393)
Browse files Browse the repository at this point in the history
* 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 <keewis@users.noreply.github.com>
  • Loading branch information
dcherian and keewis authored Oct 22, 2024
1 parent 119a58c commit a76693e
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: "dcherian/xarray"
repository: "pydata/xarray"
fetch-depth: 0 # Fetch all history for all branches and tags.
- name: Set up conda environment
uses: mamba-org/setup-micromamba@v1
Expand All @@ -116,7 +116,6 @@ jobs:
pint>=0.22
- name: Install xarray
run: |
git checkout flox-preserve-dtype
python -m pip install --no-deps .
- name: Install upstream flox
run: |
Expand Down
2 changes: 1 addition & 1 deletion ci/env-numpy1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ dependencies:
- numbagg>=0.3
- hypothesis
- pip:
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
- git+https://github.com/dcherian/xarray.git
2 changes: 1 addition & 1 deletion ci/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ dependencies:
- numbagg>=0.3
- hypothesis
- pip:
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
- git+https://github.com/dcherian/xarray.git
2 changes: 1 addition & 1 deletion ci/no-dask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ dependencies:
- numba
- numbagg>=0.3
- pip:
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
- git+https://github.com/dcherian/xarray.git
3 changes: 2 additions & 1 deletion ci/no-numba.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ dependencies:
- pytest-pretty
- pytest-xdist
- syrupy
- xarray
- pre-commit
- numpy_groupies>=0.9.19
- pooch
- toolz
- pip:
- git+https://github.com/dcherian/xarray.git
6 changes: 3 additions & 3 deletions flox/aggregations.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ def size(self) -> int:
class Aggregation:
def __init__(
self,
name,
name: str,
*,
numpy: str | FuncTuple | None = None,
numpy: str | None = None,
chunk: str | FuncTuple | None,
combine: str | FuncTuple | None,
preprocess: Callable | None = None,
Expand Down Expand Up @@ -217,7 +217,7 @@ def __init__(
self.preprocess = preprocess
# Use "chunk_reduce" or "chunk_argreduce"
self.reduction_type = reduction_type
self.numpy: FuncTuple = (numpy,) if numpy else (self.name,)
self.numpy: FuncTuple = (numpy,) if numpy is not None else (self.name,)
# initialize blockwise reduction
self.chunk: OptionalFuncTuple = _atleast_1d(chunk)
# how to aggregate results after first round of reduction
Expand Down

0 comments on commit a76693e

Please sign in to comment.