Merge branch 'main' into FEATURE_wkt

Author: trexfeathers

.github/workflows/ci-manifest.yml

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

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

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

.github/workflows/ci-wheels.yml

@@ -129,6 +129,10 @@ jobs:
     needs: test-wheel
     name: "publish to test.pypi"
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # Mandatory for PyPI Trusted Publishing OpenID Connect (OIDC)
+    environment: test-pypi
+
     # upload to Test PyPI for every commit on main branch
     # and check for the SciTools repo
     if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'SciTools'
@@ -138,18 +142,20 @@ jobs:
         name: pypi-artifacts
         path: ${{ github.workspace }}/dist
 
-    - uses: pypa/gh-action-pypi-publish@release/v1
+    - uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
       with:
-        user: __token__
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
-        skip_existing: true
-        print_hash: true
+        repository-url: https://test.pypi.org/legacy/
+        skip-existing: true
+        print-hash: true
 
   publish-artifacts-pypi:
     needs: test-wheel
     name: "publish to pypi"
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # Mandatory for PyPI Trusted Publishing OpenID Connect (OIDC)
+    environment: pypi
+
     # upload to PyPI for every tag starting with 'v'
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') && github.repository_owner == 'SciTools'
     steps:
@@ -158,8 +164,6 @@ jobs:
         name: pypi-artifacts
         path: ${{ github.workspace }}/dist
 
-    - uses: pypa/gh-action-pypi-publish@release/v1
+    - uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
       with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        print_hash: true
+        print-hash: true

.github/workflows/refresh-lockfiles.yml

@@ -14,5 +14,5 @@ on:
 
 jobs:
   refresh_lockfiles:
-    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.06.3
+    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.07.1
     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.12.0"
+    rev: "v0.12.3"
     hooks:
     -   id: ruff
         types: [file, python]
@@ -71,7 +71,7 @@ repos:
         exclude: 'noxfile\.py|docs/src/conf\.py'
 
 -   repo: https://github.com/numpy/numpydoc
-    rev: v1.8.0
+    rev: v1.9.0
     hooks:
       - id: numpydoc-validation
         exclude: "^lib/iris/tests/|docs/gallery_code/"

MANIFEST.in

@@ -21,17 +21,6 @@ recursive-include lib *.cdl *.cml *.json *.md *.py *.template *.txt *.xml
     #         - also possibly non-python, e.g. *.pyx for Cython
 
 
-#---------
-# SECTION: docs
-prune docs
-# and if required ... include ONLY docs source files.
-# E.G. recursive-include docs *.rst *.inc
-    # principles:
-    #    - use prune to ignore everything (optionally: except the docs sources)
-    # hints:
-    #    - most projects don't want to package the docs, but some currently do (cf-units).
-
-
 #---------
 # SECTION: requirements
 prune requirements
@@ -41,7 +30,6 @@ recursive-include requirements *.txt
     # hints:
     #    - not all projects include requirements, but they can be drawn in anyway by dynamic dependencies
     #        in the setuptools build process, linked via config in pyproject.toml
-    #    - for some repos, the *.txt are actually lockfiles.  This probably needs fixing.
 
 
 #---------
@@ -57,14 +45,19 @@ exclude .pre-commit-config.yaml
 exclude .readthedocs.yml
 exclude .ruff.toml
 exclude CHANGES
+include CHANGELOG.md
 include CITATION.cff
 exclude CODE_OF_CONDUCT.md
+exclude CONTRIBUTING.md
 include COPYING
 include COPYING.LESSER
+include INSTALL
 include LICENSE
 exclude Makefile
 exclude codecov.yml
 include noxfile.py
+include tox.ini
+exclude pixi.lock
     # principles:
     #    - *ANY* file in the root should be explicitly "include"- or "exclude"-d
     #         - EXCEPT (possibly) those covered by setuptools default rules (see above link)
@@ -83,6 +76,7 @@ prune .github
 prune .nox
 prune .tox
 prune .coverage
+prune docs
 # (2) top-level files to omit
 exclude .coveragerc
 # (3) file types (path patterns) to skip everywhere

docs/src/userguide/cube_statistics.rst

@@ -143,7 +143,7 @@ These areas can now be passed to the ``collapsed`` method as weights:
             forecast_reference_time     2009-11-19 04:00:00
             grid_latitude               1.5145501 degrees, bound=(0.13755022, 2.89155) degrees
             grid_longitude              358.74948 degrees, bound=(357.48724, 360.01172) degrees
-            surface_altitude            399.625 m, bound=(-14.0, 813.25) m
+            surface_altitude            <lazy>+bound
         Cell methods:
             0                           grid_longitude: grid_latitude: mean
         Attributes:
@@ -191,7 +191,7 @@ the units of the resulting cube are multiplied by an area unit:
             forecast_reference_time     2009-11-19 04:00:00
             grid_latitude               1.5145501 degrees, bound=(0.13755022, 2.89155) degrees
             grid_longitude              358.74948 degrees, bound=(357.48724, 360.01172) degrees
-            surface_altitude            399.625 m, bound=(-14.0, 813.25) m
+            surface_altitude            <lazy>+bound
         Cell methods:
             0                           grid_longitude: grid_latitude: sum
         Attributes:

docs/src/userguide/multi_array_to_cube.svg

@@ -22,8 +22,8 @@ the below table.
 
    <!-- Must import jquery before the datatables css and js files. -->
    <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
-   <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/2.0.3/css/dataTables.dataTables.min.css">
-   <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/2.0.3/js/dataTables.min.js"></script>
+   <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/2.3.2/css/dataTables.dataTables.min.css">
+   <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/2.3.2/js/dataTables.min.js"></script>
 
 
    <table id="voted_issues_table" class="hover row-border order-column" style="width:100%">
@@ -56,6 +56,6 @@ the below table.
    <p></p>
 
 
-.. note:: The data in this table is updated every 30 minutes and is sourced
-          from `voted-issues.json`_.
-          For the latest data please see the `issues on GitHub`_.
+.. note:: The data in this table is sourced from `voted-issues.json`_ and is updated
+          via a scheduled GitHub Action.  For the latest data please see
+          the `issues on GitHub`_.