Skip to content

Commit c8c27f7

Browse files
dcheriandcherian
committed
Merge branch 'main' into groupby-dask
* main: (63 commits) Add close() method to DataTree and use it to clean-up open files in tests (#9651) Change URL for pydap test (#9655) Fix multiple grouping with missing groups (#9650) flox: Properly propagate multiindex (#9649) Update Datatree html repr to indicate inheritance (#9633) Re-implement map_over_datasets using group_subtrees (#9636) fix zarr intersphinx (#9652) Replace black and blackdoc with ruff-format (#9506) Fix error and missing code cell in io.rst (#9641) Support alternative names for the root node in DataTree.from_dict (#9638) Updates to DataTree.equals and DataTree.identical (#9627) DOC: Clarify error message in open_dataarray (#9637) Add zip_subtrees for paired iteration over DataTrees (#9623) Type check datatree tests (#9632) Add missing `memo` argument to DataTree.__deepcopy__ (#9631) Bug fixes for DataTree indexing and aggregation (#9626) Add inherit=False option to DataTree.copy() (#9628) docs(groupby): mention deprecation of `squeeze` kwarg (#9625) Migration guide for users of old datatree repo (#9598) Reimplement Datatree typed ops (#9619) ...
2 parents a15b04d + 863184d commit c8c27f7

File tree

96 files changed

+5277
-2292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+5277
-2292
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github: numfocus
2-
custom: http://numfocus.org/donate-to-xarray
2+
custom: https://numfocus.org/donate-to-xarray

‎.github/workflows/benchmarks-last-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323

2424
- name: Set up conda environment
25-
uses: mamba-org/setup-micromamba@v1
25+
uses: mamba-org/setup-micromamba@v2
2626
with:
2727
environment-file: ${{env.CONDA_ENV_FILE}}
2828
environment-name: xarray-tests

‎.github/workflows/benchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fetch-depth: 0
2626

2727
- name: Set up conda environment
28-
uses: mamba-org/setup-micromamba@v1
28+
uses: mamba-org/setup-micromamba@v2
2929
with:
3030
environment-file: ${{env.CONDA_ENV_FILE}}
3131
environment-name: xarray-tests

‎.github/workflows/ci-additional.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
5656
5757
- name: Setup micromamba
58-
uses: mamba-org/setup-micromamba@v1
58+
uses: mamba-org/setup-micromamba@v2
5959
with:
6060
environment-file: ${{env.CONDA_ENV_FILE}}
6161
environment-name: xarray-tests
@@ -103,7 +103,7 @@ jobs:
103103
run: |
104104
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
105105
- name: Setup micromamba
106-
uses: mamba-org/setup-micromamba@v1
106+
uses: mamba-org/setup-micromamba@v2
107107
with:
108108
environment-file: ${{env.CONDA_ENV_FILE}}
109109
environment-name: xarray-tests
@@ -122,14 +122,14 @@ jobs:
122122
python xarray/util/print_versions.py
123123
- name: Install mypy
124124
run: |
125-
python -m pip install "mypy" --force-reinstall
125+
python -m pip install "mypy==1.11.2" --force-reinstall
126126
127127
- name: Run mypy
128128
run: |
129129
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
130130
131131
- name: Upload mypy coverage to Codecov
132-
uses: codecov/codecov-action@v4.5.0
132+
uses: codecov/codecov-action@v4.6.0
133133
with:
134134
file: mypy_report/cobertura.xml
135135
flags: mypy
@@ -157,7 +157,7 @@ jobs:
157157
run: |
158158
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
159159
- name: Setup micromamba
160-
uses: mamba-org/setup-micromamba@v1
160+
uses: mamba-org/setup-micromamba@v2
161161
with:
162162
environment-file: ${{env.CONDA_ENV_FILE}}
163163
environment-name: xarray-tests
@@ -176,14 +176,14 @@ jobs:
176176
python xarray/util/print_versions.py
177177
- name: Install mypy
178178
run: |
179-
python -m pip install "mypy" --force-reinstall
179+
python -m pip install "mypy==1.11.2" --force-reinstall
180180
181181
- name: Run mypy
182182
run: |
183183
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
184184
185185
- name: Upload mypy coverage to Codecov
186-
uses: codecov/codecov-action@v4.5.0
186+
uses: codecov/codecov-action@v4.6.0
187187
with:
188188
file: mypy_report/cobertura.xml
189189
flags: mypy-min
@@ -216,7 +216,7 @@ jobs:
216216
run: |
217217
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
218218
- name: Setup micromamba
219-
uses: mamba-org/setup-micromamba@v1
219+
uses: mamba-org/setup-micromamba@v2
220220
with:
221221
environment-file: ${{env.CONDA_ENV_FILE}}
222222
environment-name: xarray-tests
@@ -242,7 +242,7 @@ jobs:
242242
python -m pyright xarray/
243243
244244
- name: Upload pyright coverage to Codecov
245-
uses: codecov/codecov-action@v4.5.0
245+
uses: codecov/codecov-action@v4.6.0
246246
with:
247247
file: pyright_report/cobertura.xml
248248
flags: pyright
@@ -275,7 +275,7 @@ jobs:
275275
run: |
276276
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
277277
- name: Setup micromamba
278-
uses: mamba-org/setup-micromamba@v1
278+
uses: mamba-org/setup-micromamba@v2
279279
with:
280280
environment-file: ${{env.CONDA_ENV_FILE}}
281281
environment-name: xarray-tests
@@ -301,7 +301,7 @@ jobs:
301301
python -m pyright xarray/
302302
303303
- name: Upload pyright coverage to Codecov
304-
uses: codecov/codecov-action@v4.5.0
304+
uses: codecov/codecov-action@v4.6.0
305305
with:
306306
file: pyright_report/cobertura.xml
307307
flags: pyright39
@@ -324,7 +324,7 @@ jobs:
324324
fetch-depth: 0 # Fetch all history for all branches and tags.
325325

326326
- name: Setup micromamba
327-
uses: mamba-org/setup-micromamba@v1
327+
uses: mamba-org/setup-micromamba@v2
328328
with:
329329
environment-name: xarray-tests
330330
create-args: >-

‎.github/workflows/ci.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ jobs:
5858
python-version: "3.10"
5959
os: ubuntu-latest
6060
# Latest python version:
61+
- env: "all-but-numba"
62+
python-version: "3.12"
63+
os: ubuntu-latest
6164
- env: "all-but-dask"
6265
# Not 3.12 because of pint
6366
python-version: "3.11"
@@ -105,7 +108,7 @@ jobs:
105108
echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
106109
107110
- name: Setup micromamba
108-
uses: mamba-org/setup-micromamba@v1
111+
uses: mamba-org/setup-micromamba@v2
109112
with:
110113
environment-file: ${{ env.CONDA_ENV_FILE }}
111114
environment-name: xarray-tests
@@ -159,7 +162,7 @@ jobs:
159162
path: pytest.xml
160163

161164
- name: Upload code coverage to Codecov
162-
uses: codecov/codecov-action@v4.5.0
165+
uses: codecov/codecov-action@v4.6.0
163166
with:
164167
file: ./coverage.xml
165168
flags: unittests

‎.github/workflows/hypothesis.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
6262
6363
- name: Setup micromamba
64-
uses: mamba-org/setup-micromamba@v1
64+
uses: mamba-org/setup-micromamba@v2
6565
with:
6666
environment-file: ci/requirements/environment.yml
6767
environment-name: xarray-tests

‎.github/workflows/nightly-wheels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fetch-depth: 0
1414
- uses: actions/setup-python@v5
1515
with:
16-
python-version: "3.11"
16+
python-version: "3.12"
1717

1818
- name: Install dependencies
1919
run: |
@@ -38,7 +38,7 @@ jobs:
3838
fi
3939
4040
- name: Upload wheel
41-
uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
41+
uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1
4242
with:
4343
anaconda_nightly_upload_token: ${{ secrets.ANACONDA_NIGHTLY }}
4444
artifacts_path: dist

‎.github/workflows/pypi-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
path: dist
8989
- name: Publish package to TestPyPI
9090
if: github.event_name == 'push'
91-
uses: pypa/[email protected].1
91+
uses: pypa/[email protected].3
9292
with:
9393
repository_url: https://test.pypi.org/legacy/
9494
verbose: true
@@ -111,6 +111,6 @@ jobs:
111111
name: releases
112112
path: dist
113113
- name: Publish package to PyPI
114-
uses: pypa/[email protected].1
114+
uses: pypa/[email protected].3
115115
with:
116116
verbose: true

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
with:
6262
fetch-depth: 0 # Fetch all history for all branches and tags.
6363
- name: Set up conda environment
64-
uses: mamba-org/setup-micromamba@v1
64+
uses: mamba-org/setup-micromamba@v2
6565
with:
6666
environment-file: ci/requirements/environment.yml
6767
environment-name: xarray-tests
@@ -120,7 +120,7 @@ jobs:
120120
with:
121121
fetch-depth: 0 # Fetch all history for all branches and tags.
122122
- name: Set up conda environment
123-
uses: mamba-org/setup-micromamba@v1
123+
uses: mamba-org/setup-micromamba@v2
124124
with:
125125
environment-file: ci/requirements/environment.yml
126126
environment-name: xarray-tests
@@ -146,7 +146,7 @@ jobs:
146146
run: |
147147
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
148148
- name: Upload mypy coverage to Codecov
149-
uses: codecov/codecov-action@v4.5.0
149+
uses: codecov/codecov-action@v4.6.0
150150
with:
151151
file: mypy_report/cobertura.xml
152152
flags: mypy

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ci:
44
autoupdate_commit_msg: 'Update pre-commit hooks'
55
repos:
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v4.6.0
7+
rev: v5.0.0
88
hooks:
99
- id: trailing-whitespace
1010
- id: end-of-file-fixer
@@ -13,22 +13,17 @@ repos:
1313
- id: mixed-line-ending
1414
- repo: https://github.com/astral-sh/ruff-pre-commit
1515
# Ruff version.
16-
rev: 'v0.6.3'
16+
rev: 'v0.6.9'
1717
hooks:
18+
- id: ruff-format
1819
- id: ruff
1920
args: ["--fix", "--show-fixes"]
20-
# https://github.com/python/black#version-control-integration
21-
- repo: https://github.com/psf/black-pre-commit-mirror
22-
rev: 24.8.0
23-
hooks:
24-
- id: black-jupyter
2521
- repo: https://github.com/keewis/blackdoc
2622
rev: v0.3.9
2723
hooks:
2824
- id: blackdoc
2925
exclude: "generate_aggregations.py"
3026
additional_dependencies: ["black==24.8.0"]
31-
- id: blackdoc-autoupdate-black
3227
- repo: https://github.com/pre-commit/mirrors-mypy
3328
rev: v1.11.2
3429
hooks:

0 commit comments

Comments
 (0)