Skip to content

Commit 09137c3

Browse files
committed
Merge branch 'latest' into chardata_plus_encoded_datasets
2 parents 274fae4 + 043b0bc commit 09137c3

354 files changed

Lines changed: 6326 additions & 4403 deletions

File tree

Some content is hidden

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

.github/workflows/benchmarks_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
echo "reports_exist=$reports_exist" >> "$GITHUB_OUTPUT"
5555
5656
- name: Store artifact
57-
uses: actions/upload-artifact@v6
57+
uses: actions/upload-artifact@v7
5858
with:
5959
name: benchmark_reports
6060
path: benchmark_reports
@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/checkout@v6
6969

7070
- name: Download artifact
71-
uses: actions/download-artifact@v7
71+
uses: actions/download-artifact@v8
7272
with:
7373
name: benchmark_reports
7474
path: .github/workflows/benchmark_reports

.github/workflows/benchmarks_run.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ jobs:
157157
- name: Upload any benchmark reports
158158
# Uploading enables more downstream processing e.g. posting a PR comment.
159159
if: success() || steps.overnight.outcome == 'failure'
160-
uses: actions/upload-artifact@v6
160+
uses: actions/upload-artifact@v7
161161
with:
162162
name: benchmark_reports
163163
path: .github/workflows/benchmark_reports
164164

165165
- name: Archive asv results
166166
# Store the raw ASV database(s) to help manual investigations.
167167
if: ${{ always() }}
168-
uses: actions/upload-artifact@v6
168+
uses: actions/upload-artifact@v7
169169
with:
170170
name: asv-raw-results
171171
path: benchmarks/.asv/results

.github/workflows/ci-linkchecks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Link Checker
2525
id: lychee
26-
uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0
26+
uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411
2727
with:
2828
token: ${{secrets.GITHUB_TOKEN}}
2929
fail: false

.github/workflows/ci-manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ concurrency:
2323
jobs:
2424
manifest:
2525
name: "check-manifest"
26-
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2026.01.0
26+
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2026.03.2

.github/workflows/ci-template-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
prompt-share:
13-
uses: scitools/workflows/.github/workflows/ci-template-check.yml@2026.01.0
13+
uses: scitools/workflows/.github/workflows/ci-template-check.yml@2026.03.2
1414
secrets: inherit
1515
with:
1616
pr_number: ${{ github.event.pull_request.number }}

.github/workflows/ci-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: ["ubuntu-latest"]
38-
python-version: ["3.13"]
38+
python-version: ["3.14"]
3939
session: ["doctest", "gallery"]
4040
include:
4141
- os: "ubuntu-latest"
42-
python-version: "3.13"
42+
python-version: "3.14"
4343
session: "tests"
4444
coverage: "--coverage"
4545
- os: "ubuntu-latest"
46-
python-version: "3.12"
46+
python-version: "3.13"
4747
session: "tests"
4848
- os: "ubuntu-latest"
49-
python-version: "3.11"
49+
python-version: "3.12"
5050
session: "tests"
5151

5252
env:

.github/workflows/ci-wheels.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
pipx run build
3939
40-
- uses: actions/upload-artifact@v6
40+
- uses: actions/upload-artifact@v7
4141
with:
4242
name: pypi-artifacts
4343
path: ${{ github.workspace }}/dist/*
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
fail-fast: false
5454
matrix:
55-
python-version: ["3.11", "3.12", "3.13"]
55+
python-version: ["3.12", "3.13", "3.14"]
5656
session: ["wheel"]
5757
env:
5858
ENV_NAME: "ci-wheels"
@@ -61,7 +61,7 @@ jobs:
6161
with:
6262
fetch-depth: 0
6363

64-
- uses: actions/download-artifact@v7
64+
- uses: actions/download-artifact@v8
6565
with:
6666
name: pypi-artifacts
6767
path: ${{ github.workspace }}/dist
@@ -116,7 +116,7 @@ jobs:
116116
name: "show artifacts"
117117
runs-on: ubuntu-latest
118118
steps:
119-
- uses: actions/download-artifact@v7
119+
- uses: actions/download-artifact@v8
120120
with:
121121
name: pypi-artifacts
122122
path: ${{ github.workspace }}/dist
@@ -137,7 +137,7 @@ jobs:
137137
# and check for the SciTools repo
138138
if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'SciTools'
139139
steps:
140-
- uses: actions/download-artifact@v7
140+
- uses: actions/download-artifact@v8
141141
with:
142142
name: pypi-artifacts
143143
path: ${{ github.workspace }}/dist
@@ -159,7 +159,7 @@ jobs:
159159
# upload to PyPI for every tag starting with 'v'
160160
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') && github.repository_owner == 'SciTools'
161161
steps:
162-
- uses: actions/download-artifact@v7
162+
- uses: actions/download-artifact@v8
163163
with:
164164
name: pypi-artifacts
165165
path: ${{ github.workspace }}/dist

.github/workflows/refresh-lockfiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ on:
1414

1515
jobs:
1616
refresh_lockfiles:
17-
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2026.01.0
17+
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2026.03.2
1818
secrets: inherit

.lycheeignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ file:///
44
# DEAD : legacy in various old whatsnews
55
https://biggus.readthedocs.io
66

7-
# unkown problem, works in browser : used in further_topics/ugrid/data_model
7+
# unknown problem, works in browser : used in
8+
# docs/src/user_manual/explanation/mesh_data_model.rst
89
https://doi.org/10.3390/jmse2010194
910

10-
# DEAD, todo:remove, used in docs/src/userguide/plotting_a_cube.rst
11+
# DEAD, todo:remove, used in docs/src/user_manual/tutorial/plotting_a_cube.rst
1112
https://effbot.org
1213

1314
# nonfunctional, found in some code examples
1415
https://foo/
1516

16-
# DEAD, todo:remove, used in docs/src/further_topics/ugrid/data_model.rst
17+
# DEAD, todo:remove, used in docs/src/user_manual/explanation/mesh_data_model.rst
1718
https://ibm-design-language.eu-de.mybluemix.net/design/language/resources/color-library
1819

1920
# DEAD, legacy in whatsnew/1.4.rst
@@ -45,14 +46,14 @@ https://stickler-ci.com
4546
# DEAD, todo:remove, used in lib/iris/symbols.py
4647
https://www.wmo.int/pages/prog/www/DPFS/documents/485_Vol_I_en_colour.pdf
4748

48-
# DEAD, todo:remove, used in docs/src/userguide/plotting_a_cube.rst
49+
# DEAD, todo:remove, used in docs/src/user_manual/tutorial/plotting_a_cube.rst
4950
# unkown problem, works in browser : used in docs/src/index.rst
5051
https://www.flaticon.com
5152

5253
# nonfunctional example, used in lib/iris/io/__init__.py
5354
https://www.thing.com
5455

55-
# DEAD, todo:remove, used in docs/src/userguide/plotting_a_cube.rst
56+
# DEAD, todo:remove, used in docs/src/user_manual/tutorial/plotting_a_cube.rst
5657
https://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html
5758

5859
# nonfunctional, found in some code examples

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ repos:
3535
- id: no-commit-to-branch
3636

3737
- repo: https://github.com/astral-sh/ruff-pre-commit
38-
rev: "v0.14.10"
38+
rev: "v0.15.4"
3939
hooks:
4040
- id: ruff
4141
types: [file, python]

0 commit comments

Comments
 (0)