Unit and integration test fixes (#736)

Author: forsyth2

tests/integration/test_images.py

@@ -54,14 +54,14 @@ def test_images():
         if "weekly_bundles" in expansions["cfgs_to_run"]:
             # No mpas_analysis
             if "mpas_analysis" in expansions["tasks_to_run"]:
-                tasks_to_run = tasks_to_run.copy()
-                tasks_to_run.remove("mpas_analysis")
+                tasks_to_run_copy = tasks_to_run.copy()
+                tasks_to_run_copy.remove("mpas_analysis")
             set_up_and_run_image_checker(
                 "bundles",
                 V3_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                tasks_to_run,
+                tasks_to_run_copy,
                 test_results_dict,
             )
 
@@ -90,14 +90,14 @@ def test_images():
         if "weekly_legacy_3.0.0_bundles" in expansions["cfgs_to_run"]:
             # No mpas_analysis
             if "mpas_analysis" in expansions["tasks_to_run"]:
-                tasks_to_run = tasks_to_run.copy()
-                tasks_to_run.remove("mpas_analysis")
+                tasks_to_run_copy = tasks_to_run.copy()
+                tasks_to_run_copy.remove("mpas_analysis")
             set_up_and_run_image_checker(
                 "legacy_3.0.0_bundles",
                 V3_CASE_NAME,
                 expansions,
                 diff_dir_suffix,
-                tasks_to_run,
+                tasks_to_run_copy,
                 test_results_dict,
             )
     except Exception as e:

zppy/utils.py

@@ -187,8 +187,7 @@ def set_grid(c: Dict[str, Any]) -> None:
             c["grid"] = "glb"
         else:
             tmp = os.path.basename(c["mapping_file"])
-            # FIXME: W605 invalid escape sequence '\.'
-            tmp = re.sub("\.[^.]*\.nc$", "", tmp)  # noqa: W605
+            tmp = re.sub(r"\.[^.]*\.nc$", "", tmp)
             tmp = tmp.split("_")
             if tmp[0] == "map":
                 c["grid"] = f"{tmp[-2]}_{tmp[-1]}"