Skip to content

Commit 68edd74

Browse files
committed
Merge remote-tracking branch 'upstream/main' into engine_none
* upstream/main: Support quantile, median, mode with method="blockwise". (xarray-contrib#269) Add multidimensional binning demo (xarray-contrib#203) [pre-commit.ci] pre-commit autoupdate (xarray-contrib#268) Drop python 3.8, test python 3.11 (xarray-contrib#209) tests: move xfail out of functions (xarray-contrib#265) Bump actions/checkout from 3 to 4 (xarray-contrib#267)
2 parents c8000e3 + 68b122e commit 68edd74

23 files changed

+725
-160
lines changed

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
# We need the full repo to avoid this issue
1919
# https://github.com/actions/checkout/issues/23
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

.github/workflows/ci-additional.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
outputs:
2323
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 2
2828
- uses: xarray-contrib/[email protected]
@@ -41,10 +41,10 @@ jobs:
4141

4242
env:
4343
CONDA_ENV_FILE: ci/environment.yml
44-
PYTHON_VERSION: "3.10"
44+
PYTHON_VERSION: "3.11"
4545

4646
steps:
47-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
4848
with:
4949
fetch-depth: 0 # Fetch all history for all branches and tags.
5050

@@ -92,10 +92,10 @@ jobs:
9292
shell: bash -l {0}
9393
env:
9494
CONDA_ENV_FILE: ci/environment.yml
95-
PYTHON_VERSION: "3.10"
95+
PYTHON_VERSION: "3.11"
9696

9797
steps:
98-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
9999
with:
100100
fetch-depth: 0 # Fetch all history for all branches and tags.
101101

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
os: ["ubuntu-latest", "windows-latest"]
28-
python-version: ["3.8", "3.10"]
28+
python-version: ["3.9", "3.11"]
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0 # Fetch all history for all branches and tags.
3333
- name: Set environment variables
@@ -74,7 +74,7 @@ jobs:
7474
"minimal-requirements",
7575
]
7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7878
with:
7979
fetch-depth: 0 # Fetch all history for all branches and tags.
8080
- name: Set up conda environment
@@ -108,7 +108,7 @@ jobs:
108108
run:
109109
shell: bash -l {0}
110110
steps:
111-
- uses: actions/checkout@v3
111+
- uses: actions/checkout@v4
112112
with:
113113
repository: 'pydata/xarray'
114114
fetch-depth: 0 # Fetch all history for all branches and tags.

.github/workflows/pypi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
deploy:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Set up Python
1313
uses: actions/setup-python@v4
1414
with:

.github/workflows/testpypi-release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
if: ${{ contains( github.event.pull_request.labels.*.name, 'test-build') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

2424
- uses: actions/setup-python@v4
2525
name: Install Python
2626
with:
27-
python-version: "3.10"
27+
python-version: "3.11"
2828

2929
- name: Install dependencies
3030
run: |
@@ -65,7 +65,7 @@ jobs:
6565
- uses: actions/setup-python@v4
6666
name: Install Python
6767
with:
68-
python-version: "3.10"
68+
python-version: "3.11"
6969
- uses: actions/download-artifact@v3
7070
with:
7171
name: releases

.github/workflows/upstream-dev-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
python-version: ["3.10"]
29+
python-version: ["3.11"]
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0 # Fetch all history for all branches and tags.
3434
- name: Set environment variables

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ci:
44
repos:
55
- repo: https://github.com/astral-sh/ruff-pre-commit
66
# Ruff version.
7-
rev: 'v0.0.276'
7+
rev: 'v0.0.292'
88
hooks:
99
- id: ruff
1010
args: ["--fix"]
@@ -18,12 +18,12 @@ repos:
1818
- id: check-docstring-first
1919

2020
- repo: https://github.com/psf/black
21-
rev: 23.3.0
21+
rev: 23.9.1
2222
hooks:
2323
- id: black
2424

2525
- repo: https://github.com/executablebooks/mdformat
26-
rev: 0.7.16
26+
rev: 0.7.17
2727
hooks:
2828
- id: mdformat
2929
additional_dependencies:
@@ -44,13 +44,13 @@ repos:
4444
args: [--extra-keys=metadata.kernelspec metadata.language_info.version]
4545

4646
- repo: https://github.com/codespell-project/codespell
47-
rev: v2.2.5
47+
rev: v2.2.6
4848
hooks:
4949
- id: codespell
5050
additional_dependencies:
5151
- tomli
5252

5353
- repo: https://github.com/abravalheri/validate-pyproject
54-
rev: v0.13
54+
rev: v0.14
5555
hooks:
5656
- id: validate-pyproject

ci/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ dependencies:
2222
- pooch
2323
- toolz
2424
- numba
25+
- scipy

docs/source/aggregations.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ the `func` kwarg:
1111
- `"std"`, `"nanstd"`
1212
- `"argmin"`
1313
- `"argmax"`
14-
- `"first"`
15-
- `"last"`
14+
- `"first"`, `"nanfirst"`
15+
- `"last"`, `"nanlast"`
16+
- `"median"`, `"nanmedian"`
17+
- `"mode"`, `"nanmode"`
18+
- `"quantile"`, `"nanquantile"`
1619

1720
```{tip}
1821
We would like to add support for `cumsum`, `cumprod` ([issue](https://github.com/xarray-contrib/flox/issues/91)). Contributions are welcome!

docs/source/implementation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ width: 100%
199199
1. Group labels must be known at graph construction time, so this only works for numpy arrays.
200200
1. This does require more tasks and a more complicated graph, but the communication overhead can be significantly lower.
201201
1. The detection of "cohorts" is currently slow but could be improved.
202-
1. The extra effort of detecting cohorts and mul;tiple copying of intermediate blocks may be worthwhile only if the chunk sizes are small
202+
1. The extra effort of detecting cohorts and multiple copying of intermediate blocks may be worthwhile only if the chunk sizes are small
203203
relative to the approximate period of group labels, or small relative to the size of spatially localized groups.
204204

205205
### Example : sensitivity to chunking

0 commit comments

Comments
 (0)