Skip to content

Commit bb8b8d6

Browse files
ianhiianhi
authored
Merge branch 'main' into index-docs
2 parents 8d9a29a + a813e00 commit bb8b8d6

Some content is hidden

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

49 files changed

+1038
-208
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
cp benchmarks/README_CI.md benchmarks.log .asv/results/
7474
working-directory: ${{ env.ASV_DIR }}
7575

76-
- uses: actions/upload-artifact@v5
76+
- uses: actions/upload-artifact@v6
7777
if: always()
7878
with:
7979
name: asv-benchmark-results-${{ runner.os }}

‎.github/workflows/benchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
cp benchmarks/README_CI.md benchmarks.log .asv/results/
7171
working-directory: ${{ env.ASV_DIR }}
7272

73-
- uses: actions/upload-artifact@v5
73+
- uses: actions/upload-artifact@v6
7474
if: always()
7575
with:
7676
name: asv-benchmark-results-${{ runner.os }}

‎.github/workflows/cache-pixi-lock.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,36 @@ jobs:
1717
outputs:
1818
cache-id: ${{ steps.restore.outputs.cache-primary-key }}
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 0
2323
submodules: recursive
2424
- name: Get current date
2525
id: date
2626
run: echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
27-
- uses: actions/cache/restore@v4
27+
- uses: actions/cache/restore@v5
2828
id: restore
2929
with:
3030
path: |
3131
pixi.lock
3232
key: ${{ steps.date.outputs.date }}_${{ inputs.pixi-version }}_${{hashFiles('pixi.toml')}}
33-
- uses: prefix-dev/[email protected].0
33+
- uses: prefix-dev/[email protected].3
3434
if: ${{ !steps.restore.outputs.cache-hit }}
3535
with:
3636
pixi-version: ${{ inputs.pixi-version }}
3737
run-install: false
3838
- name: Run pixi lock
3939
if: ${{ !steps.restore.outputs.cache-hit }}
4040
run: pixi lock
41-
- uses: actions/cache/save@v4
41+
- uses: actions/cache/save@v5
4242
if: ${{ !steps.restore.outputs.cache-hit }}
4343
id: cache
4444
with:
4545
path: |
4646
pixi.lock
4747
key: ${{ steps.restore.outputs.cache-primary-key }}
4848
- name: Upload pixi.lock
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v6
5050
with:
5151
name: pixi-lock
5252
path: pixi.lock

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ jobs:
5959
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
6060
6161
- name: Restore cached pixi lockfile
62-
uses: actions/cache/restore@v4
62+
uses: actions/cache/restore@v5
6363
id: restore-pixi-lock
6464
with:
6565
enableCrossOsArchive: true
6666
path: |
6767
pixi.lock
6868
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
69-
- uses: prefix-dev/[email protected].0
69+
- uses: prefix-dev/[email protected].3
7070
with:
7171
pixi-version: ${{ env.PIXI_VERSION }}
7272
cache: true
@@ -101,14 +101,14 @@ jobs:
101101
with:
102102
fetch-depth: 0 # Fetch all history for all branches and tags.
103103
- name: Restore cached pixi lockfile
104-
uses: actions/cache/restore@v4
104+
uses: actions/cache/restore@v5
105105
id: restore-pixi-lock
106106
with:
107107
enableCrossOsArchive: true
108108
path: |
109109
pixi.lock
110110
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
111-
- uses: prefix-dev/[email protected].0
111+
- uses: prefix-dev/[email protected].3
112112
with:
113113
pixi-version: ${{ env.PIXI_VERSION }}
114114
cache: true
@@ -127,7 +127,7 @@ jobs:
127127
pixi run -e ${{env.PIXI_ENV}} -- python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
128128
129129
- name: Upload mypy coverage to Codecov
130-
uses: codecov/[email protected].1
130+
uses: codecov/[email protected].2
131131
with:
132132
file: mypy_report/cobertura.xml
133133
flags: mypy
@@ -150,14 +150,14 @@ jobs:
150150
with:
151151
fetch-depth: 0 # Fetch all history for all branches and tags.
152152
- name: Restore cached pixi lockfile
153-
uses: actions/cache/restore@v4
153+
uses: actions/cache/restore@v5
154154
id: restore-pixi-lock
155155
with:
156156
enableCrossOsArchive: true
157157
path: |
158158
pixi.lock
159159
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
160-
- uses: prefix-dev/[email protected].0
160+
- uses: prefix-dev/[email protected].3
161161
with:
162162
pixi-version: ${{ env.PIXI_VERSION }}
163163
cache: true
@@ -176,7 +176,7 @@ jobs:
176176
pixi run -e ${{env.PIXI_ENV}} -- python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
177177
178178
- name: Upload mypy coverage to Codecov
179-
uses: codecov/[email protected].1
179+
uses: codecov/[email protected].2
180180
with:
181181
file: mypy_report/cobertura.xml
182182
flags: mypy-min
@@ -207,14 +207,14 @@ jobs:
207207
fetch-depth: 0 # Fetch all history for all branches and tags.
208208

209209
- name: Restore cached pixi lockfile
210-
uses: actions/cache/restore@v4
210+
uses: actions/cache/restore@v5
211211
id: restore-pixi-lock
212212
with:
213213
enableCrossOsArchive: true
214214
path: |
215215
pixi.lock
216216
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
217-
- uses: prefix-dev/[email protected].0
217+
- uses: prefix-dev/[email protected].3
218218
with:
219219
pixi-version: ${{ env.PIXI_VERSION }}
220220
cache: true
@@ -233,7 +233,7 @@ jobs:
233233
pixi run -e ${{ matrix.pixi-env }} -- python -m pyright xarray/
234234
235235
- name: Upload pyright coverage to Codecov
236-
uses: codecov/[email protected].1
236+
uses: codecov/[email protected].2
237237
with:
238238
file: pyright_report/cobertura.xml
239239
flags: pyright
@@ -265,13 +265,13 @@ jobs:
265265
python-version: "3.x"
266266

267267
- name: All-deps minimum versions policy
268-
uses: xarray-contrib/minimum-dependency-versions@e2ac8ff0a76e8603d8536ef5d64743a375961ce9 # v0.1.1
268+
uses: xarray-contrib/minimum-dependency-versions@3db8e1c17328ee1e27dfe4db90d908644856eb61 # v1.0.0
269269
with:
270270
policy: ci/policy.yaml
271271
environment-paths: ci/requirements/min-all-deps.yml
272272

273273
- name: Bare minimum versions policy
274-
uses: xarray-contrib/minimum-dependency-versions@e2ac8ff0a76e8603d8536ef5d64743a375961ce9 # v0.1.1
274+
uses: xarray-contrib/minimum-dependency-versions@3db8e1c17328ee1e27dfe4db90d908644856eb61 # v1.0.0
275275
with:
276276
policy: ci/policy.yaml
277277
environment-paths: ci/requirements/bare-minimum.yml

‎.github/workflows/ci.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ jobs:
8484
with:
8585
fetch-depth: 0 # Fetch all history for all branches and tags.
8686
- name: Restore cached pixi lockfile
87-
uses: actions/cache/restore@v4
87+
uses: actions/cache/restore@v5
8888
id: restore-pixi-lock
8989
with:
9090
enableCrossOsArchive: true
9191
path: |
9292
pixi.lock
9393
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
94-
- uses: prefix-dev/[email protected].0
94+
- uses: prefix-dev/[email protected].3
9595
with:
9696
pixi-version: ${{ env.PIXI_VERSION }}
9797
cache: true
@@ -135,7 +135,7 @@ jobs:
135135
pixi run -e ${{ matrix.pixi-env }} -- python -c "import xarray"
136136
137137
- name: Restore cached hypothesis directory
138-
uses: actions/cache@v4
138+
uses: actions/cache@v5
139139
with:
140140
path: .hypothesis/
141141
key: cache-hypothesis
@@ -152,13 +152,13 @@ jobs:
152152
153153
- name: Upload test results
154154
if: always()
155-
uses: actions/upload-artifact@v5
155+
uses: actions/upload-artifact@v6
156156
with:
157157
name: Test results for OS ${{ runner.os }} pixi-env ${{ matrix.pixi-env }} pytest-addopts ${{ matrix.pytest-addopts }}
158158
path: pytest.xml
159159

160160
- name: Upload code coverage to Codecov
161-
uses: codecov/[email protected].1
161+
uses: codecov/[email protected].2
162162
env:
163163
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
164164
with:
@@ -174,7 +174,7 @@ jobs:
174174
if: github.repository == 'pydata/xarray'
175175
steps:
176176
- name: Upload
177-
uses: actions/upload-artifact@v5
177+
uses: actions/upload-artifact@v6
178178
with:
179179
name: Event File
180180
path: ${{ github.event_path }}

‎.github/workflows/hypothesis.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ jobs:
6363
fetch-depth: 0 # Fetch all history for all branches and tags.
6464

6565
- name: Restore cached pixi lockfile
66-
uses: actions/cache/restore@v4
66+
uses: actions/cache/restore@v5
6767
id: restore-pixi-lock
6868
with:
6969
enableCrossOsArchive: true
7070
path: |
7171
pixi.lock
7272
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
73-
- uses: prefix-dev/[email protected].0
73+
- uses: prefix-dev/[email protected].3
7474
with:
7575
pixi-version: ${{ env.PIXI_VERSION }}
7676
cache: true
@@ -89,7 +89,7 @@ jobs:
8989
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
9090
- name: Restore cached hypothesis directory
9191
id: restore-hypothesis-cache
92-
uses: actions/cache/restore@v4
92+
uses: actions/cache/restore@v5
9393
with:
9494
path: .hypothesis/
9595
key: cache-hypothesis-${{ runner.os }}-${{ github.run_id }}
@@ -107,7 +107,7 @@ jobs:
107107
- name: Save cached hypothesis directory
108108
id: save-hypothesis-cache
109109
if: always() && steps.status.outcome != 'skipped'
110-
uses: actions/cache/save@v4
110+
uses: actions/cache/save@v5
111111
with:
112112
path: .hypothesis/
113113
key: cache-hypothesis-${{ runner.os }}-${{ github.run_id }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
else
5050
echo "✅ Looks good"
5151
fi
52-
- uses: actions/upload-artifact@v5
52+
- uses: actions/upload-artifact@v6
5353
with:
5454
name: releases
5555
path: dist
@@ -62,7 +62,7 @@ jobs:
6262
name: Install Python
6363
with:
6464
python-version: "3.12"
65-
- uses: actions/download-artifact@v6
65+
- uses: actions/download-artifact@v7
6666
with:
6767
name: releases
6868
path: dist
@@ -89,7 +89,7 @@ jobs:
8989
id-token: write
9090

9191
steps:
92-
- uses: actions/download-artifact@v6
92+
- uses: actions/download-artifact@v7
9393
with:
9494
name: releases
9595
path: dist
@@ -112,7 +112,7 @@ jobs:
112112
id-token: write
113113

114114
steps:
115-
- uses: actions/download-artifact@v6
115+
- uses: actions/download-artifact@v7
116116
with:
117117
name: releases
118118
path: dist

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ jobs:
6464
with:
6565
fetch-depth: 0 # Fetch all history for all branches and tags.
6666
- name: Restore cached pixi lockfile
67-
uses: actions/cache/restore@v4
67+
uses: actions/cache/restore@v5
6868
id: restore-pixi-lock
6969
with:
7070
enableCrossOsArchive: true
7171
path: |
7272
pixi.lock
7373
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
74-
- uses: prefix-dev/[email protected].0
74+
- uses: prefix-dev/[email protected].3
7575
with:
7676
pixi-version: ${{ env.PIXI_VERSION }}
7777
cache: true
@@ -121,14 +121,14 @@ jobs:
121121
fetch-depth: 0 # Fetch all history for all branches and tags.
122122

123123
- name: Restore cached pixi lockfile
124-
uses: actions/cache/restore@v4
124+
uses: actions/cache/restore@v5
125125
id: restore-pixi-lock
126126
with:
127127
enableCrossOsArchive: true
128128
path: |
129129
pixi.lock
130130
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
131-
- uses: prefix-dev/[email protected].0
131+
- uses: prefix-dev/[email protected].3
132132
with:
133133
pixi-version: ${{ env.PIXI_VERSION }}
134134
cache: true
@@ -146,7 +146,7 @@ jobs:
146146
run: |
147147
pixi run -e ${{matrix.pixi-env}} -- python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
148148
- name: Upload mypy coverage to Codecov
149-
uses: codecov/[email protected].1
149+
uses: codecov/[email protected].2
150150
with:
151151
file: mypy_report/cobertura.xml
152152
flags: mypy

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ Xarray bundles portions of pandas, NumPy and Seaborn, all of which are
130130
available under a "3-clause BSD" license:
131131

132132
- pandas: `setup.py`, `xarray/util/print_versions.py`
133-
- NumPy: `xarray/core/npcompat.py`
134-
- Seaborn: `_determine_cmap_params` in `xarray/core/plot/utils.py`
133+
- NumPy: `xarray/compat/npcompat.py`
134+
- Seaborn: `_determine_cmap_params` in `xarray/plot/utils.py`
135135

136136
Xarray also bundles portions of CPython, which is available under the
137-
"Python Software Foundation License" in `xarray/core/pycompat.py`.
137+
"Python Software Foundation License" in `xarray/namedarray/pycompat.py`.
138138

139139
Xarray uses icons from the icomoon package (free version), which is
140140
available under the "CC BY 4.0" license.

‎ci/requirements/environment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- nodefaults
55
dependencies:
66
- aiobotocore
7-
- array-api-strict<2.4
7+
- array-api-strict
88
- boto3
99
- bottleneck
1010
- cartopy

0 commit comments

Comments
 (0)