Skip to content

Commit b7dc23b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into bugfix/varlen_str_type
* upstream/main: (98 commits) [pre-commit.ci] pre-commit autoupdate (SciTools#6335) SPEC 0: drop py310 and support py313 (SciTools#6195) Better benchmarking Python version handling (SciTools#6329) Move loading and combine code into their own submodules. (SciTools#6321) Bump scitools/workflows from 2025.02.1 to 2025.02.2 (SciTools#6327) replaced reference from build to python build (SciTools#6324) [pre-commit.ci] pre-commit autoupdate (SciTools#6315) Cache Dask arrays created from `NetCDFDataProxy`s to speed up loading files with multiple variables (SciTools#6252) Bump scitools/workflows from 2025.02.0 to 2025.02.1 (SciTools#6313) [pre-commit.ci] pre-commit autoupdate (SciTools#6310) Bump scitools/workflows from 2025.01.5 to 2025.02.0 (SciTools#6306) Updated environment lockfiles (SciTools#6301) Improve speed of loading small NetCDF files (SciTools#6229) [pre-commit.ci] pre-commit autoupdate (SciTools#6298) Use cube chunks for weights in aggregations with smart weights (SciTools#6288) Updated environment lockfiles (SciTools#6296) Bump scitools/workflows from 2025.01.4 to 2025.01.5 (SciTools#6300) Bump scitools/workflows from 2025.01.3 to 2025.01.4 (SciTools#6295) Lazy rectilinear interpolator (SciTools#6084) Revert "Fix broken link. (SciTools#6246)" (SciTools#6297) ...
2 parents faf0b2e + bb1b196 commit b7dc23b

File tree

290 files changed

+22997
-14939
lines changed

Some content is hidden

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

290 files changed

+22997
-14939
lines changed

.github/workflows/benchmarks_run.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
env:
6161
IRIS_TEST_DATA_LOC_PATH: benchmarks
6262
IRIS_TEST_DATA_PATH: benchmarks/iris-test-data
63-
IRIS_TEST_DATA_VERSION: "2.22"
63+
IRIS_TEST_DATA_VERSION: "2.28"
6464
# Lets us manually bump the cache to rebuild
6565
ENV_CACHE_BUILD: "0"
6666
TEST_DATA_CACHE_BUILD: "2"

.github/workflows/ci-manifest.yml

+1-1
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@2024.09.8
26+
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.02.2

.github/workflows/ci-tests.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,23 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: ["ubuntu-latest"]
38-
python-version: ["3.12"]
38+
python-version: ["3.13"]
3939
session: ["doctest", "gallery", "linkcheck"]
4040
include:
4141
- os: "ubuntu-latest"
42-
python-version: "3.12"
42+
python-version: "3.13"
4343
session: "tests"
4444
coverage: "--coverage"
4545
- os: "ubuntu-latest"
46-
python-version: "3.11"
46+
python-version: "3.12"
4747
session: "tests"
4848
- os: "ubuntu-latest"
49-
python-version: "3.10"
49+
python-version: "3.11"
5050
session: "tests"
5151

5252
env:
53-
IRIS_TEST_DATA_VERSION: "2.25"
53+
# NOTE: IRIS_TEST_DATA_VERSION is also set in benchmarks_run.yml
54+
IRIS_TEST_DATA_VERSION: "2.28"
5455
ENV_NAME: "ci-tests"
5556

5657
steps:
@@ -142,6 +143,6 @@ jobs:
142143
143144
- name: "upload coverage report"
144145
if: ${{ matrix.coverage }}
145-
uses: codecov/codecov-action@v4
146+
uses: codecov/codecov-action@v5
146147
with:
147148
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci-wheels.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
fail-fast: false
5454
matrix:
55-
python-version: ["3.10", "3.11", "3.12"]
55+
python-version: ["3.11", "3.12", "3.13"]
5656
session: ["wheel"]
5757
env:
5858
ENV_NAME: "ci-wheels"

.github/workflows/refresh-lockfiles.yml

+1-1
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@2024.09.8
17+
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.02.2
1818
secrets: inherit

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,6 @@ docs/iris_image_test_output/
7979

8080
# Files generated during test runs.
8181
lib/iris/tests/results/**/*.dot
82+
83+
# Uses of SciTools-incubator/nothing.
84+
**/.nothing

.pre-commit-config.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ minimum_pre_commit_version: 1.21.0
1313

1414
repos:
1515
- repo: https://github.com/pre-commit/pre-commit-hooks
16-
rev: v4.6.0
16+
rev: v5.0.0
1717
hooks:
1818
# Prevent giant files from being committed.
1919
- id: check-added-large-files
@@ -29,7 +29,7 @@ repos:
2929
- id: no-commit-to-branch
3030

3131
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: "v0.4.10"
32+
rev: "v0.9.7"
3333
hooks:
3434
- id: ruff
3535
types: [file, python]
@@ -38,40 +38,40 @@ repos:
3838
types: [file, python]
3939

4040
- repo: https://github.com/codespell-project/codespell
41-
rev: "v2.3.0"
41+
rev: "v2.4.1"
4242
hooks:
4343
- id: codespell
4444
types_or: [asciidoc, python, markdown, rst]
4545
additional_dependencies: [tomli]
4646

4747
- repo: https://github.com/PyCQA/flake8
48-
rev: 7.1.0
48+
rev: 7.1.2
4949
hooks:
5050
- id: flake8
5151
types: [file, python]
5252

5353
- repo: https://github.com/asottile/blacken-docs
54-
rev: 1.16.0
54+
rev: 1.19.1
5555
hooks:
5656
- id: blacken-docs
5757
types: [file, rst]
5858

5959
- repo: https://github.com/aio-libs/sort-all
60-
rev: v1.2.0
60+
rev: v1.3.0
6161
hooks:
6262
- id: sort-all
6363
types: [file, python]
6464

6565
- repo: https://github.com/pre-commit/mirrors-mypy
66-
rev: 'v1.9.0'
66+
rev: 'v1.15.0'
6767
hooks:
6868
- id: mypy
6969
additional_dependencies:
7070
- 'types-requests'
7171
exclude: 'noxfile\.py|docs/src/conf\.py'
7272

7373
- repo: https://github.com/numpy/numpydoc
74-
rev: v1.7.0
74+
rev: v1.8.0
7575
hooks:
7676
- id: numpydoc-validation
7777
exclude: "^lib/iris/tests/|docs/gallery_code/"

benchmarks/asv.conf.json

+5-42
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,20 @@
33
"project": "scitools-iris",
44
"project_url": "https://github.com/SciTools/iris",
55
"repo": "..",
6-
"environment_type": "delegated",
6+
"environment_type": "delegated-iris",
77
"show_commit_url": "https://github.com/scitools/iris/commit/",
88
"branches": ["upstream/main"],
99

1010
"benchmark_dir": "./benchmarks",
1111
"env_dir": ".asv/env",
1212
"results_dir": ".asv/results",
1313
"html_dir": ".asv/html",
14-
"plugins": [".asv_delegated"],
15-
16-
"delegated_env_commands_comment": [
17-
"The command(s) that create/update an environment correctly for the",
18-
"checked-out commit. Command(s) format follows `build_command`:",
19-
" https://asv.readthedocs.io/en/stable/asv.conf.json.html#build-command-install-command-uninstall-command",
20-
21-
"The commit key indicates the earliest commit where the command(s)",
22-
"will work.",
23-
24-
"Differences from `build_command`:",
25-
" * See: https://asv.readthedocs.io/en/stable/asv.conf.json.html#build-command-install-command-uninstall-command",
26-
" * Env vars limited to those set outside build time.",
27-
" (e.g. `{conf_dir}` available but `{build_dir}` not)",
28-
" * Run in the same environment as the ASV install itself.",
29-
30-
"Mandatory format for the first 'command' within each commit:",
31-
" * `ENV_PARENT=path/to/parent/directory/of/env-directory`",
32-
" * Can contain env vars (e.g. `{conf_dir}`)",
33-
" * `ENV_PARENT` available as `{env_parent}` in subsequent commands",
34-
" * The environment will be detected as the most recently updated",
35-
" environment in `{env_parent}`."
36-
37-
],
38-
"delegated_env_commands": {
39-
"c8a663a0": [
40-
"ENV_PARENT={conf_dir}/.asv/env/nox312",
41-
"PY_VER=3.12 nox --envdir={env_parent} --session=tests --install-only --no-error-on-external-run --verbose"
42-
],
43-
"d58fca7e": [
44-
"ENV_PARENT={conf_dir}/.asv/env/nox311",
45-
"PY_VER=3.11 nox --envdir={env_parent} --session=tests --install-only --no-error-on-external-run --verbose"
46-
],
47-
"44fae030": [
48-
"ENV_PARENT={conf_dir}/.asv/env/nox310",
49-
"PY_VER=3.10 nox --envdir={env_parent} --session=tests --install-only --no-error-on-external-run --verbose"
50-
]
51-
},
14+
"plugins": [".asv_delegated_iris"],
5215

5316
"command_comment": [
54-
"We know that the Nox command takes care of installation in each",
55-
"environment, and in the case of Iris no specialised uninstall or",
56-
"build commands are needed to get it working.",
17+
"The inherited setup of the Iris test environment takes care of ",
18+
"Iris-installation too, and in the case of Iris no specialised ",
19+
"uninstall or build commands are needed to get it working either.",
5720

5821
"We do however need to install the custom benchmarks for them to be",
5922
"usable."

0 commit comments

Comments
 (0)