Avoid running tests twice if they error out

Author: cmutel

src/flowmapper/main.py

@@ -2,7 +2,6 @@
 import logging
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 from flowmapper.flow import Flow
 from flowmapper.flowmap import Flowmap
@@ -38,14 +37,14 @@ def flowmapper(
     format: OutputFormat,
     version: str = "1.0.0",
     default_transformations: bool = True,
-    transformations: Optional[list[Path | str]] = None,
+    transformations: list[Path | str] | None = None,
     unmatched_source: bool = True,
     unmatched_target: bool = True,
     matched_source: bool = False,
     matched_target: bool = False,
-    licenses: Optional[list] = None,
-    homepage: Optional[str] = None,
-    name: Optional[str] = None,
+    licenses: list | None = None,
+    homepage: str | None = None,
+    name: str | None = None,
 ) -> Flowmap:
     """
     Generate mappings between elementary flows lists

tests/test_id_generation.py

@@ -8,4 +8,6 @@ def test_generate_flow_id():
         "unit": "kg",
         "CAS number": "000110-63-4",
     }
-    assert generate_flow_id(flow1) == "77bb0c932afd7d7eb7ada382c8828b9f", f"Expected generate_flow_id(flow1) to equal '77bb0c932afd7d7eb7ada382c8828b9f', but got {generate_flow_id(flow1)!r}"
+    actual = generate_flow_id(flow1)
+    expected = "77bb0c932afd7d7eb7ada382c8828b9f"
+    assert actual == expected, f"Expected generate_flow_id(flow1) to equal '{expected}', but got {actual!r}"

tests/test_match_custom_names_with_location_codes.py

@@ -58,7 +58,8 @@ def test_match_custom_names_with_location_codes_no_match():
     t = Flow(
         {"name": "water, unspecified natural origin", "context": "air", "unit": "kg"}
     )
-    assert match_custom_names_with_location_codes(s, t, [], []) is None, f"Expected match_custom_names_with_location_codes to return None, but got {match_custom_names_with_location_codes(s, t, [], [])}"
+    result = match_custom_names_with_location_codes(s, t, [], [])
+    assert result is None, f"Expected match_custom_names_with_location_codes to return None, but got {result}"
 
 
 def test_match_custom_names_with_location_codes_conversion():

tests/test_match_names_with_country_codes.py

@@ -23,7 +23,8 @@ def test_match_names_with_country_codes_extra_whitespace():
 def test_match_names_with_country_codes_no_match():
     s = Flow({"name": "Ammonia-NL", "context": "air", "unit": "kg"})
     t = Flow({"name": "Ammonia", "context": "air", "unit": "kg"})
-    assert match_names_with_location_codes(s, t, [], []) is None, f"Expected match_names_with_location_codes to return None, but got {match_names_with_location_codes(s, t, [], [])}"
+    result = match_names_with_location_codes(s, t, [], [])
+    assert result is None, f"Expected match_names_with_location_codes to return None, but got {result}"
 
 
 def test_match_names_with_country_codes_complicated_location():