Skip to content

Commit f6f7285

Browse files
committed
merge
1 parent 833253e commit f6f7285

File tree

143 files changed

+6272
-2687
lines changed

Some content is hidden

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

143 files changed

+6272
-2687
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
benchmark:
1111
name: Linux
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
env:
1414
ASV_DIR: "./asv_bench"
1515
CONDA_ENV_FILE: ci/requirements/environment.yml

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
benchmark:
1313
if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || contains( github.event.pull_request.labels.*.name, 'topic-performance') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
1414
name: Linux
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
env:
1717
ASV_DIR: "./asv_bench"
1818
CONDA_ENV_FILE: ci/requirements/environment.yml

.github/workflows/ci-additional.yaml

Lines changed: 4 additions & 4 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/codecov-action@v5.4.2
126+
uses: codecov/codecov-action@v5.4.3
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/codecov-action@v5.4.2
177+
uses: codecov/codecov-action@v5.4.3
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/codecov-action@v5.4.2
233+
uses: codecov/codecov-action@v5.4.3
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/codecov-action@v5.4.2
289+
uses: codecov/codecov-action@v5.4.3
290290
with:
291291
file: pyright_report/cobertura.xml
292292
flags: pyright39

.github/workflows/ci.yaml

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

174174
- name: Upload code coverage to Codecov
175-
uses: codecov/codecov-action@v5.4.2
175+
uses: codecov/codecov-action@v5.4.3
176176
env:
177177
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
178178
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
run: |
141141
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
142142
- name: Upload mypy coverage to Codecov
143-
uses: codecov/codecov-action@v5.4.2
143+
uses: codecov/codecov-action@v5.4.3
144144
with:
145145
file: mypy_report/cobertura.xml
146146
flags: mypy

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ __pycache__
1010
doc/*.nc
1111
doc/auto_gallery
1212
doc/rasm.zarr
13-
doc/savefig
1413

1514
# C extensions
1615
*.so

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
- id: text-unicode-replacement-char
2626
- repo: https://github.com/astral-sh/ruff-pre-commit
2727
# Ruff version.
28-
rev: v0.11.4
28+
rev: v0.11.12
2929
hooks:
3030
- id: ruff-format
3131
- id: ruff
@@ -42,7 +42,7 @@ repos:
4242
- id: prettier
4343
args: [--cache-location=.prettier_cache/cache]
4444
- repo: https://github.com/pre-commit/mirrors-mypy
45-
rev: v1.15.0
45+
rev: v1.16.0
4646
hooks:
4747
- id: mypy
4848
# Copied from setup.cfg

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Xarray's contributor guidelines [can be found in our online documentation](https://docs.xarray.dev/en/stable/contributing.html)
1+
Xarray's contributor guidelines [can be found in our online documentation](https://docs.xarray.dev/en/stable/contribute/contributing.html)

CORE_TEAM_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ resources such as:
272272
- [`pre-commit`](https://pre-commit.com) hooks for autoformatting.
273273
- [`ruff`](https://github.com/astral-sh/ruff) autoformatting and linting.
274274
- [python-xarray](https://stackoverflow.com/questions/tagged/python-xarray) on Stack Overflow.
275-
- [@xarray_dev](https://twitter.com/xarray_dev) on Twitter.
275+
- [@xarray_dev](https://x.com/xarray_dev) on X.
276276
- [xarray-dev](https://discord.gg/bsSGdwBn) discord community (normally only used for remote synchronous chat during sprints).
277277

278278
You are not required to monitor any of the social resources.

HOW_TO_RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ upstream https://github.com/pydata/xarray (push)
114114
- SHA256 hash (Click "Show Hashes" next to the link to the wheel)
115115
- Open a pull request to pyodide
116116
117-
14. Issue the release announcement to mailing lists & Twitter. For bug fix releases, I
117+
14. Issue the release announcement to mailing lists & Twitter (X). For bug fix releases, I
118118
usually only email xarray@googlegroups.com. For major/feature releases, I will email a broader
119119
list (no more than once every 3-6 months):
120120

0 commit comments

Comments
 (0)