Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v3.10.x' into v3.10.x.updates
Browse files Browse the repository at this point in the history
* upstream/v3.10.x:
  Add mesh metas to the iris.common.metadata public API. (SciTools#6093)
  Update cf_table v85 (SciTools#6100)
  Bump scitools/workflows from 2024.07.5 to 2024.07.6 (SciTools#6099)
  • Loading branch information
HGWright committed Jul 30, 2024
2 parents 9fb603f + ff85847 commit a88694a
Show file tree
Hide file tree
Showing 5 changed files with 1,173 additions and 270 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ concurrency:
jobs:
manifest:
name: "check-manifest"
uses: scitools/workflows/.github/workflows/[email protected].5
uses: scitools/workflows/.github/workflows/[email protected].6
2 changes: 1 addition & 1 deletion .github/workflows/refresh-lockfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ on:

jobs:
refresh_lockfiles:
uses: scitools/workflows/.github/workflows/[email protected].5
uses: scitools/workflows/.github/workflows/[email protected].6
secrets: inherit
3 changes: 3 additions & 0 deletions docs/src/whatsnew/3.10.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ This document explains the changes made to Iris for this release
#. `@HGWright`_ added the `monthly` and `yearly` options to the
:meth:`~iris.coords.guess_bounds` method. (:issue:`4864`, :pull:`6090`)

#. `@HGWright`_ updated to the latest CF Standard Names Table v85
(30 July 2024). (:pull:`6100`)


🐛 Bugs Fixed
=============
Expand Down
Loading

0 comments on commit a88694a

Please sign in to comment.