Merge remote-tracking branch 'origin/zinchelper' into zinchelper

src/sparc/client/zinchelper.py

@@ -2,9 +2,11 @@
 import os
 import re
 
+from cmlibs.utils.zinc.field import get_group_list
 from cmlibs.zinc.context import Context
 from cmlibs.zinc.result import RESULT_OK
-from cmlibs.utils.zinc.field import get_group_list
+from mbfxml2ex.app import read_xml
+from mbfxml2ex.zinc import load, write_ex
 from scaffoldmaker import scaffolds
 from scaffoldmaker.annotation.bladder_terms import get_bladder_term
 from scaffoldmaker.annotation.body_terms import get_body_term
@@ -20,8 +22,6 @@
 from scaffoldmaker.annotation.stomach_terms import get_stomach_term
 from scaffoldmaker.utils.exportvtk import ExportVtk
 from sparc.client.services.pennsieve import PennsieveService
-from mbfxml2ex.app import read_xml
-from mbfxml2ex.zinc import load, write_ex
 
 
 class ZincHelper:

tests/test_zinc.py

@@ -92,8 +92,10 @@ def test_analyse_with_input_file_without_group(zinc):
     # Test file that has no group
     input_file_name = "test_input.xml"
     organ = "stomach"
-    expected = f"The data file {input_file_name} doesn't have any groups, " \
-               f"therefore this data file is not suitable for mapping."
+    expected = (
+        f"The data file {input_file_name} doesn't have any groups, "
+        f"therefore this data file is not suitable for mapping."
+    )
     with open(input_file_name, "w") as f:
         f.write("<root><data>Test data</data></root>")
     # Call the analyse function and assert that it succeeds