Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
475286f
Align pre-commit-config with SciTools template.
trexfeathers Feb 2, 2026
a1acce0
blacken-docs.
trexfeathers Feb 2, 2026
59077d7
codespell.
trexfeathers Feb 2, 2026
93c2c05
end-of-file-fixer.
trexfeathers Feb 2, 2026
da8a60f
mixed-line-ending.
trexfeathers Feb 2, 2026
57a9279
trailing-whitespace.
trexfeathers Feb 2, 2026
2973018
sp-repo-review.
trexfeathers Feb 2, 2026
2c7e288
Tidy-up.
trexfeathers Feb 2, 2026
ef21669
MyPy.
trexfeathers Feb 4, 2026
0355f64
Merge remote-tracking branch 'upstream/main' into repo-review
trexfeathers Feb 4, 2026
27cbeb6
Merge remote-tracking branch 'upstream/main' into repo-review
trexfeathers Apr 29, 2026
d3b17aa
Post-merge linting tidy up.
trexfeathers Apr 29, 2026
7004730
Align pyproject.toml with template.
trexfeathers Apr 29, 2026
3ea52f3
Align with linting guidelines: SciTools/.github/wiki/Linting .
trexfeathers Apr 29, 2026
116b9f5
Missed a spot.
trexfeathers Apr 29, 2026
e5f1efd
Revert end-of-file fixer changes.
trexfeathers Apr 29, 2026
a5ea37d
Remove trailing pipe from pre-commit files list, which was was matchi…
trexfeathers Apr 29, 2026
2ebc1fa
Revert "trailing-whitespace."
trexfeathers Apr 29, 2026
cd5f350
Merge branch 'main' into repo-review
trexfeathers Apr 30, 2026
1bc90b4
Fix import sorting.
trexfeathers Apr 30, 2026
e9dadbd
More consistent assert examples.
trexfeathers May 1, 2026
8a5c5d0
Use text code-blocks to allow prompts without upsetting blacken-docs.
trexfeathers May 1, 2026
d27e5da
Undo changes to cf-standard-name-table.xml .
trexfeathers May 1, 2026
530750b
Remove duplicated ruff config in pyproject.toml .
trexfeathers May 1, 2026
6c70aca
Restore previous benchmarks sorting.
trexfeathers May 1, 2026
1ad361d
Merge branch 'main' into repo-review
trexfeathers May 5, 2026
3feab63
Merge branch 'main' into repo-review
pp-mo May 5, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,44 +27,44 @@ jobs:
# Comment on the staled issues.
stale-issue-message: |
It has been 500 days since last activity on this issue, so it has been given the https://github.com/SciTools/iris/labels/needs-checkin label. This reminder prompts us to identify issues which:

1. Have been resolved since their last update.
2. Are no longer relevant.
3. Are still outstanding and should be assigned resource.
4. Are still outstanding but for which there is not enough resource.

If this issue is still important to you, then please comment on this issue. The https://github.com/SciTools/iris/labels/needs-checkin label will be automatically removed.

If there is no activity on this issue for 28 days, it will be closed and given the https://github.com/SciTools/iris/labels/not-resourced label.

# Comment on the staled prs.
stale-pr-message: |
It has been 500 days since last activity on this PR, so it has been given the https://github.com/SciTools/iris/labels/needs-checkin label. This reminder prompts us to identify PRs which:

1. Have now been addressed by other PR(s).
2. Are no longer relevant.
3. Are still outstanding and should be assigned resource.
4. Are still outstanding but for which there is not enough resource.

If this PR is still important to you, then please comment on this PR. The https://github.com/SciTools/iris/labels/needs-checkin label will be automatically removed.

If there is no activity on this PR for 28 days, it will be closed and given the https://github.com/SciTools/iris/labels/not-resourced label.

# Comment on the staled issues while closed.
close-issue-message: |
This issue has been automatically closed due to inactivity since the recent https://github.com/SciTools/iris/labels/needs-checkin request.

If you still want this issue to get attention, then please either:

- Re-open this issue, if you have sufficient permissions, or ...
- Add a comment pinging `@SciTools/iris-devs` who will re-open on your behalf.

# Comment on the staled prs while closed.
close-pr-message: |
This PR has been automatically closed due to inactivity since the recent https://github.com/SciTools/iris/labels/needs-checkin request.

If you still want this PR to get attention, then please either:

- Re-open this PR, if you have sufficient permissions, or ...
- Add a comment pinging `@SciTools/iris-devs` who will re-open on your behalf.

Expand Down
84 changes: 60 additions & 24 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,48 +1,68 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
# See https://pre-commit.ci/#configuration
# See https://github.com/scientific-python/cookie#sp-repo-review

ci:
autofix_prs: false
autofix_commit_msg: "style: pre-commit fixes"
autoupdate_commit_msg: "chore: update pre-commit hooks"
autoupdate_schedule: "monthly"


# Alphabetised, for lack of a better order.
files: |
(?x)(
noxfile\.py|
setup\.py|
benchmarks\/.+\.py|
docs\/.+\.py|
lib\/.+\.py|
benchmarks\/.+\.py|
tools\/.+\.py
noxfile\.py|
pyproject\.toml|
tools\/.+\.py|
setup\.py
)
minimum_pre_commit_version: 1.21.0

repos:

# Hook for pre-commit's built-in checks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v6.0.0
hooks:
# Prevent giant files from being committed.
- id: check-added-large-files
# Check whether files parse as valid Python.
- id: check-ast
# Check for file name conflicts on case-insensitive filesytems.
# Check for file name conflicts on case-insensitive filesystems.
- id: check-case-conflict
# Check for files that contain merge conflict strings.
- id: check-merge-conflict
# Check for debugger imports and py37+ `breakpoint()` calls in Python source.
- id: debug-statements
# Check TOML file syntax.
- id: check-toml
# Check YAML file syntax.
- id: check-yaml
# Makes sure files end in a newline and only a newline.
# Duplicates Ruff W292 but also works on non-Python files.
- id: end-of-file-fixer
# Replaces or checks mixed line ending.
- id: mixed-line-ending
# Don't commit to main branch.
- id: no-commit-to-branch
# Trims trailing whitespace.
# Duplicates Ruff W291 but also works on non-Python files.
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.15.12"
# Hooks from all other repos
# NOTE : keep these in hook-name (aka 'id') order

- repo: https://github.com/adamchainz/blacken-docs
# This template does not keep up-to-date with versions, visit the repo to see the most recent release.
rev: 1.20.0
hooks:
- id: ruff
types: [file, python]
args: [--fix, --show-fixes]
- id: ruff-format
types: [file, python]
- id: blacken-docs
types: [file, rst]

- repo: https://github.com/codespell-project/codespell
rev: "v2.4.2"
Expand All @@ -51,18 +71,6 @@ repos:
types_or: [asciidoc, python, markdown, rst]
additional_dependencies: [tomli]

- repo: https://github.com/asottile/blacken-docs
rev: 1.20.0
hooks:
- id: blacken-docs
types: [file, rst]

- repo: https://github.com/aio-libs/sort-all
rev: v1.3.0
hooks:
- id: sort-all
types: [file, python]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v1.20.2'
hooks:
Expand All @@ -77,3 +85,31 @@ repos:
- id: numpydoc-validation
exclude: "^lib/iris/tests/|docs/gallery_code/"
types: [file, python]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.15.12"
hooks:
- id: ruff-check
types: [file, python]
args: [--fix, --show-fixes]
- id: ruff-format
types: [file, python]

- repo: https://github.com/aio-libs/sort-all
rev: v1.3.0
hooks:
- id: sort-all
types: [file, python]

- repo: https://github.com/scientific-python/cookie
rev: 2025.11.21
hooks:
- id: sp-repo-review
additional_dependencies: ["repo-review[cli]"]
args: ["--show=errskip"]

- repo: https://github.com/abravalheri/validate-pyproject
# More exhaustive than Ruff RUF200.
rev: "v0.24.1"
hooks:
- id: validate-pyproject
176 changes: 0 additions & 176 deletions .ruff.toml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/src/_static/theme_override.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ ul.squarelist {

.center {
text-align: center;
}
}
1 change: 0 additions & 1 deletion docs/src/developers_guide/contributing_documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ If you're not then we've got a step-by-step guide here to walk you through it:

contributing_documentation_easy
contributing_documentation_full

Loading
Loading