Skip to content

Commit 9f3c270

Browse files
committed
Merge branch 'main' into custom-groupers
* main: (63 commits) Fix zarr upstream tests (pydata#9927) Update pre-commit hooks (pydata#9925) split out CFDatetimeCoder, deprecate use_cftime as kwarg (pydata#9901) dev whats-new (pydata#9923) Whats-new 2025.01.0 (pydata#9919) Silence upstream Zarr warnings (pydata#9920) time coding refactor (pydata#9906) fix warning from scipy backend guess_can_open on directory (pydata#9911) Enhance and move ISO-8601 parser to coding.times (pydata#9899) Edit serialization error message (pydata#9916) friendlier error messages for missing chunk managers (pydata#9676) Bump codecov/codecov-action from 5.1.1 to 5.1.2 in the actions group (pydata#9915) Rewrite interp to use `apply_ufunc` (pydata#9881) Skip dask rolling (pydata#9909) Explicitly configure ReadTheDocs build to use conf.py (pydata#9908) Cache pre-existing Zarr arrays in Zarr backend (pydata#9861) Optimize idxmin, idxmax with dask (pydata#9800) remove unused "type: ignore" comments in test_plot.py (fixed in matplotlib 3.10.0) (pydata#9904) move scalar-handling logic into `possibly_convert_objects` (pydata#9900) Add missing DataTree attributes to docs (pydata#9876) ...
2 parents a21952a + 1e5045a commit 9f3c270

File tree

136 files changed

+5097
-2290
lines changed

Some content is hidden

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

136 files changed

+5097
-2290
lines changed

.binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- h5py
1717
- hdf5
1818
- iris
19-
- lxml # Optional dep of pydap
19+
- lxml # Optional dep of pydap
2020
- matplotlib
2121
- nc-time-axis
2222
- netcdf4

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ coverage:
1010
flags:
1111
- unittests
1212
paths:
13-
- "!xarray/tests/"
13+
- "!xarray/tests/"
1414
unittests:
1515
target: 90%
1616
flags:

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: 2
22
updates:
3-
- package-ecosystem: 'github-actions'
4-
directory: '/'
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
55
schedule:
66
# Check for updates once a week
7-
interval: 'weekly'
7+
interval: "weekly"
88
groups:
99
actions:
1010
patterns:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
- name: Set up conda environment
2525
uses: mamba-org/setup-micromamba@v2
2626
with:
27-
micromamba-version: '1.5.10-0'
27+
micromamba-version: "1.5.10-0"
2828
environment-file: ${{env.CONDA_ENV_FILE}}
2929
environment-name: xarray-tests
3030
cache-environment: true
3131
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}-benchmark"
3232
create-args: >-
3333
asv
3434
35-
- name: 'Get Previous tag'
35+
- name: "Get Previous tag"
3636
id: previoustag
3737
uses: "WyriHaximus/github-action-get-previous-tag@v1"
3838
# with:

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up conda environment
2828
uses: mamba-org/setup-micromamba@v2
2929
with:
30-
micromamba-version: '1.5.10-0'
30+
micromamba-version: "1.5.10-0"
3131
environment-file: ${{env.CONDA_ENV_FILE}}
3232
environment-name: xarray-tests
3333
cache-environment: true
@@ -38,7 +38,6 @@ jobs:
3838
python-build
3939
mamba<=1.5.10
4040
41-
4241
- name: Run benchmarks
4342
shell: bash -l {0}
4443
id: benchmark

.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@v4.6.0
126+
uses: codecov/codecov-action@v5.1.2
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@v4.6.0
177+
uses: codecov/codecov-action@v5.1.2
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@v4.6.0
233+
uses: codecov/codecov-action@v5.1.2
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@v4.6.0
289+
uses: codecov/codecov-action@v5.1.2
290290
with:
291291
file: pyright_report/cobertura.xml
292292
flags: pyright39

.github/workflows/ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,9 @@ jobs:
159159
path: pytest.xml
160160

161161
- name: Upload code coverage to Codecov
162-
uses: codecov/[email protected]
162+
uses: codecov/[email protected]
163+
env:
164+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
163165
with:
164166
file: ./coverage.xml
165167
flags: unittests

.github/workflows/hypothesis.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
runs-on: "ubuntu-latest"
3838
needs: detect-ci-trigger
3939
if: |
40-
always()
41-
&& (
42-
needs.detect-ci-trigger.outputs.triggered == 'false'
43-
&& ( (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
44-
|| contains( github.event.pull_request.labels.*.name, 'run-slow-hypothesis'))
45-
)
40+
always()
41+
&& (
42+
needs.detect-ci-trigger.outputs.triggered == 'false'
43+
&& ( (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
44+
|| contains( github.event.pull_request.labels.*.name, 'run-slow-hypothesis'))
45+
)
4646
defaults:
4747
run:
4848
shell: bash -l {0}
@@ -92,8 +92,8 @@ jobs:
9292
if: success()
9393
id: status
9494
run: |
95-
python -m pytest --hypothesis-show-statistics --run-slow-hypothesis properties/*.py \
96-
--report-log output-${{ matrix.python-version }}-log.jsonl
95+
python -m pytest --hypothesis-show-statistics --run-slow-hypothesis properties/*.py \
96+
--report-log output-${{ matrix.python-version }}-log.jsonl
9797
9898
# explicitly save the cache so it gets updated, also do this even if it fails.
9999
- name: Save cached hypothesis directory

.github/workflows/pypi-release.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- published
66
push:
77
tags:
8-
- 'v*'
8+
- "v*"
99

1010
jobs:
1111
build-artifacts:
@@ -88,12 +88,11 @@ jobs:
8888
path: dist
8989
- name: Publish package to TestPyPI
9090
if: github.event_name == 'push'
91-
uses: pypa/[email protected].2
91+
uses: pypa/[email protected].3
9292
with:
9393
repository_url: https://test.pypi.org/legacy/
9494
verbose: true
9595

96-
9796
upload-to-pypi:
9897
needs: test-built-dist
9998
if: github.event_name == 'release'
@@ -111,6 +110,6 @@ jobs:
111110
name: releases
112111
path: dist
113112
- name: Publish package to PyPI
114-
uses: pypa/[email protected].2
113+
uses: pypa/[email protected].3
115114
with:
116115
verbose: true

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
env:
4444
ZARR_V3_EXPERIMENTAL_API: 1
4545
if: |
46-
always()
47-
&& (
48-
(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
49-
|| needs.detect-ci-trigger.outputs.triggered == 'true'
50-
|| contains( github.event.pull_request.labels.*.name, 'run-upstream')
51-
)
46+
always()
47+
&& (
48+
(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
49+
|| needs.detect-ci-trigger.outputs.triggered == 'true'
50+
|| contains( github.event.pull_request.labels.*.name, 'run-upstream')
51+
)
5252
defaults:
5353
run:
5454
shell: bash -l {0}
@@ -101,10 +101,10 @@ jobs:
101101
runs-on: ubuntu-latest
102102
needs: detect-ci-trigger
103103
if: |
104-
always()
105-
&& (
106-
contains( github.event.pull_request.labels.*.name, 'run-upstream')
107-
)
104+
always()
105+
&& (
106+
contains( github.event.pull_request.labels.*.name, 'run-upstream')
107+
)
108108
defaults:
109109
run:
110110
shell: bash -l {0}
@@ -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@v4.6.0
143+
uses: codecov/codecov-action@v5.1.2
144144
with:
145145
file: mypy_report/cobertura.xml
146146
flags: mypy

0 commit comments

Comments
 (0)