Merge branch 'main' into auto-update-lockfiles

SciTools · Jan 2, 2025 · 198c287 · 198c287
2 parents e2146b9 + fe60f54
commit 198c287
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/refresh-lockfiles.yml b/.github/workflows/refresh-lockfiles.yml
@@ -10,5 +10,5 @@ on:
 
 jobs:
   refresh_lockfiles:
-    uses: scitools/workflows/.github/workflows/[email protected].0
+    uses: scitools/workflows/.github/workflows/[email protected].5
     secrets: inherit
diff --git a/src/iris_grib/tests/unit/load_convert/test_product_definition_template_0.py b/src/iris_grib/tests/unit/load_convert/test_product_definition_template_0.py
@@ -14,6 +14,7 @@
 
 from unittest import mock
 
+from iris import FUTURE as IRIS_FUTURE
 import iris.coords
 
 import iris_grib
@@ -81,8 +82,14 @@ def test_generating_process_warnings(self):
         emit_warnings = convert_options.warn_on_unsupported
         try:
             convert_options.warn_on_unsupported = True
-            with mock.patch("warnings.warn") as warn:
-                product_definition_template_0(section_4(), metadata, rt_coord)
+            future_kwargs = {}
+            if hasattr(IRIS_FUTURE, "date_microseconds"):
+                # Avoid an additional awkward warning
+                # TODO: convert regime to pytest + tidy, but that is a lot of work !
+                future_kwargs["date_microseconds"] = True
+            with IRIS_FUTURE.context(**future_kwargs):
+                with mock.patch("warnings.warn") as warn:
+                    product_definition_template_0(section_4(), metadata, rt_coord)
             warn_msgs = [call[1][0] for call in warn.mock_calls]
             expected = [
                 "Unable to translate type of generating process.",