Merge branch 'main' into lockfiles-pytest

Author: pp-mo

.github/workflows/ci-linkchecks.yml

@@ -5,31 +5,47 @@ on:
   schedule:
     - cron: "00 06 * * *"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   linkChecker:
     runs-on: ubuntu-latest
     permissions:
       issues: write # required for peter-evans/create-issue-from-file
+
     steps:
       - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          persist-credentials: false
 
       - name: Link Checker
         id: lychee
         uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0
         with:
           token: ${{secrets.GITHUB_TOKEN}}
           fail: false
-          args: "--verbose --max-concurrency 1 './docs/**/*.rst' './docs/**/*.inc' './lib/**/*.py'"
+          args: |
+            --verbose
+            --max-concurrency 1
+            './docs/**/*.rst'
+            './docs/**/*.inc'
+            './lib/**/*.py'
 
       - name: Create Issue From File
-        if: steps.lychee.outputs.exit_code != 0
+        if: ${{ fromJSON(steps.lychee.outputs.exit_code) != 0 }}
         uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710
         with:
           title: Link Checker Report
           content-filepath: ./lychee/out.md
-          labels: "Bot, Type: Documentation, Type: Bug"
+          labels: |
+            Bot
+            Type: Documentation
+            Type: Bug
 
       - name: Fail Workflow On Link Errors
-        if: steps.lychee.outputs.exit_code != 0
+        if: ${{ fromJSON(steps.lychee.outputs.exit_code) != 0 }}
         run:
-          exit {{ steps.lychee.outputs.exit_code }}
+          exit ${{ fromJSON(steps.lychee.outputs.exit_code) }}

.github/workflows/ci-manifest.yml

@@ -23,4 +23,4 @@ concurrency:
 jobs:
   manifest:
     name: "check-manifest"
-    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.11.2
+    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.11.4

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

@@ -10,7 +10,7 @@ on:
 
 jobs:
   prompt-share:
-    uses: scitools/workflows/.github/workflows/ci-template-check.yml@2025.11.2
+    uses: scitools/workflows/.github/workflows/ci-template-check.yml@2025.11.4
     secrets: inherit
     with:
       pr_number: ${{ github.event.pull_request.number }}

.github/workflows/refresh-lockfiles.yml

@@ -14,5 +14,5 @@ on:
 
 jobs:
   refresh_lockfiles:
-    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.11.2
+    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.11.4
     secrets: inherit

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
     -   id: no-commit-to-branch
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.14.4"
+    rev: "v0.14.5"
     hooks:
     -   id: ruff
         types: [file, python]

docs/src/whatsnew/latest.rst

@@ -72,15 +72,17 @@ This document explains the changes made to Iris for this release
 💼 Internal
 ===========
 
-#. N/A
+#. `@trexfeathers`_ and `@hdyson`_ updated ``_ff_replacement.py`` to clarify
+   that Iris supports Ancillaries. (:pull:`6792`)
 
 
 .. comment
     Whatsnew author names (@github name) in alphabetical order. Note that,
     core dev names are automatically included by the common_links.inc:
 
+.. _@hdyson: https://github.com/hdyson
 
 
 
 .. comment
-    Whatsnew resources in alphabetical order:
+    Whatsnew resources in alphabetical order:

lib/iris/fileformats/um/_ff_replacement.py

@@ -4,7 +4,7 @@
 # See LICENSE in the root of the repository for full licensing details.
 """Support for UM "fieldsfile-like" files.
 
-At present, the only UM file types supported are true FieldsFiles and LBCs.
+UM file types known to be supported: FieldsFiles, LBCs, Ancillaries.
 Other types of UM file may fail to load correctly (or at all).
 
 """