Skip to content

Commit 471ad2d

Browse files
committed
Merge branch 'main' into netcdf4-memory
2 parents f267148 + 40c27d1 commit 471ad2d

File tree

14 files changed

+137
-69
lines changed

14 files changed

+137
-69
lines changed

.github/workflows/ci-additional.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
124124
125125
- name: Upload mypy coverage to Codecov
126-
uses: codecov/[email protected].0
126+
uses: codecov/[email protected].1
127127
with:
128128
file: mypy_report/cobertura.xml
129129
flags: mypy
@@ -174,7 +174,7 @@ jobs:
174174
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
175175
176176
- name: Upload mypy coverage to Codecov
177-
uses: codecov/[email protected].0
177+
uses: codecov/[email protected].1
178178
with:
179179
file: mypy_report/cobertura.xml
180180
flags: mypy-min
@@ -230,7 +230,7 @@ jobs:
230230
python -m pyright xarray/
231231
232232
- name: Upload pyright coverage to Codecov
233-
uses: codecov/[email protected].0
233+
uses: codecov/[email protected].1
234234
with:
235235
file: pyright_report/cobertura.xml
236236
flags: pyright
@@ -286,7 +286,7 @@ jobs:
286286
python -m pyright xarray/
287287
288288
- name: Upload pyright coverage to Codecov
289-
uses: codecov/[email protected].0
289+
uses: codecov/[email protected].1
290290
with:
291291
file: pyright_report/cobertura.xml
292292
flags: pyright39
@@ -311,7 +311,7 @@ jobs:
311311
with:
312312
fetch-depth: 0 # Fetch all history for all branches and tags.
313313

314-
- uses: actions/setup-python@v5
314+
- uses: actions/setup-python@v6
315315
with:
316316
python-version: "3.x"
317317

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
path: pytest.xml
174174

175175
- name: Upload code coverage to Codecov
176-
uses: codecov/[email protected].0
176+
uses: codecov/[email protected].1
177177
env:
178178
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
179179
with:

.github/workflows/label-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
label:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/labeler@v5
9+
- uses: actions/labeler@v6
1010
with:
1111
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1212
sync-labels: false

.github/workflows/nightly-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v5
1212
with:
1313
fetch-depth: 0
14-
- uses: actions/setup-python@v5
14+
- uses: actions/setup-python@v6
1515
with:
1616
python-version: "3.12"
1717

.github/workflows/pypi-release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v5
2424
with:
2525
fetch-depth: 0
26-
- uses: actions/setup-python@v5
26+
- uses: actions/setup-python@v6
2727
name: Install Python
2828
with:
2929
python-version: "3.12"
@@ -58,7 +58,7 @@ jobs:
5858
needs: build-artifacts
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/setup-python@v5
61+
- uses: actions/setup-python@v6
6262
name: Install Python
6363
with:
6464
python-version: "3.12"
@@ -95,7 +95,7 @@ jobs:
9595
path: dist
9696
- name: Publish package to TestPyPI
9797
if: github.event_name == 'push'
98-
uses: pypa/gh-action-pypi-publish@v1.12.4
98+
uses: pypa/gh-action-pypi-publish@v1.13.0
9999
with:
100100
repository_url: https://test.pypi.org/legacy/
101101
verbose: true
@@ -117,6 +117,6 @@ jobs:
117117
name: releases
118118
path: dist
119119
- name: Publish package to PyPI
120-
uses: pypa/gh-action-pypi-publish@v1.12.4
120+
uses: pypa/gh-action-pypi-publish@v1.13.0
121121
with:
122122
verbose: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
run: |
139139
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
140140
- name: Upload mypy coverage to Codecov
141-
uses: codecov/[email protected].0
141+
uses: codecov/[email protected].1
142142
with:
143143
file: mypy_report/cobertura.xml
144144
flags: mypy

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11183201.svg)](https://doi.org/10.5281/zenodo.11183201)
1313
[![Examples on binder](https://img.shields.io/badge/launch-binder-579ACA.svg?logo=data:image/png;base64,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)](https://mybinder.org/v2/gh/pydata/xarray/main?urlpath=lab/tree/doc/examples/weather-data.ipynb)
1414
[![Twitter](https://img.shields.io/twitter/follow/xarray_dev?style=social)](https://x.com/xarray_dev)
15+
[![image](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/pydata/xarray/refs/heads/main/doc/badge.json)](https://xarray.dev)
1516

1617
**xarray** (pronounced "ex-array", formerly known as **xray**) is an open source project and Python
1718
package that makes working with labelled multi-dimensional arrays

doc/badge.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"label": "",
3+
"message": "xarray",
4+
"logoSvg": "<svg xml:space=\"preserve\" style=\"max-height: 500px\" viewBox=\"24 57.6 553.2 493.2\" y=\"0px\" x=\"0px\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns=\"http://www.w3.org/2000/svg\" id=\"Layer_1\" version=\"1.1\" width=\"553.2\" height=\"493.2\"><style type=\"text/css\">.st0{fill:#216C89;}.st1{fill:#4993AA;}.st2{fill:#0F4565;}.st3{fill:#6BE8E8;}.st4{fill:#9DEEF4;}.st5{fill:#4ACFDD;}.st6{fill:#E38017;}.st7{fill:#16AFB5;}</style><g><g><polygon points=\"266.62,546.18 356.1,454.54 356.1,271.27 266.62,362.9\" class=\"st0\"/><polygon points=\"356.1,271.45 114.48,271.45 25,362.9 266.62,362.9\" class=\"st1\"/><rect height=\"183.27\" width=\"241.62\" class=\"st2\" y=\"362.9\" x=\"25\"/></g><g><polygon points=\"266.62,328.73 356.1,237.1 356.1,53.82 266.62,145.46\" class=\"st3\"/><polygon points=\"356.1,54 114.48,54 25,145.46 266.62,145.46\" class=\"st4\"/><rect height=\"183.27\" width=\"241.62\" class=\"st5\" y=\"145.46\" x=\"25\"/></g><polygon points=\"467.47,452.33 374.48,546.18 374.48,362.9 467.47,269.05\" class=\"st6\"/><polygon points=\"575,452.33 482.01,546.18 482.01,362.9 575,269.05\" class=\"st7\"/></g></svg>",
5+
"logoWidth": 14,
6+
"labelColor": "#4a4a4a",
7+
"color": "#0e4666"
8+
}

doc/whats-new.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Bug fixes
4343
(:pull:`10624`).
4444
By `Stephan Hoyer <https://github.com/shoyer>`_.
4545

46+
- Fix the ``align_chunks`` parameter on the :py:meth:`~xarray.Dataset.to_zarr` method, it was not being
47+
passed to the underlying :py:meth:`~xarray.backends.api` method (:issue:`10501`, :pull:`10516`).
4648

4749
Documentation
4850
~~~~~~~~~~~~~

0 commit comments

Comments
 (0)