Merge branch 'psyclone_3_support_clean' into add_shell_tool_clean

MetOffice · Nov 21, 2024 · 70c083e · 70c083e
2 parents ae61d4a + 7168f42
commit 70c083e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/source/fab/tools/tool_repository.py b/source/fab/tools/tool_repository.py
@@ -170,7 +170,8 @@ def get_default(self, category: Category,
 
         :param category: the category for which to return the default tool.
         :param mpi: if a compiler or linker is required that supports MPI.
-        :param openmp: if a compiler or linker is required that supports OpenMP.
+        :param openmp: if a compiler or linker is required that supports
+            OpenMP.
 
         :raises KeyError: if the category does not exist.
         :raises RuntimeError: if no compiler/linker is found with the

diff --git a/tests/unit_tests/tools/test_compiler.py b/tests/unit_tests/tools/test_compiler.py
@@ -670,7 +670,8 @@ def test_ifort_get_version_invalid_version(version):
     with mock.patch.object(ifort, "run", mock.Mock(return_value=full_output)):
         with pytest.raises(RuntimeError) as err:
             ifort.get_version()
-        assert "Unexpected version output format for compiler" in str(err.value)
+        assert ("Unexpected version output format for compiler"
+                in str(err.value))
 
 
 # ============================================================================