Merge remote-tracking branch 'origin/main'

Author: romainsacchi

pathways/pathways.py

@@ -81,10 +81,7 @@ def _load_array(filepath):
             elif Path(filepath[0]).suffix == ".json":
                 with open(filepath[0], encoding="utf-8") as f:
                     payload = json.load(f)
-                return {
-                    tuple(item["activity"]): int(item["index"])
-                    for item in payload
-                }
+                return {tuple(item["activity"]): int(item["index"]) for item in payload}
             elif Path(filepath[0]).suffix == ".pkl":
                 if not ALLOW_UNSAFE_PICKLE:
                     raise ValueError(

pathways/utils.py

@@ -239,7 +239,9 @@ def load_units_conversion() -> dict:
     with open(UNITS_CONVERSION, "r") as f:
         data = yaml.safe_load(f)
     if not isinstance(data, dict):
-        raise ValueError("Invalid units conversion mapping: expected a YAML dictionary.")
+        raise ValueError(
+            "Invalid units conversion mapping: expected a YAML dictionary."
+        )
 
     return data
 
@@ -508,7 +510,9 @@ def clean_cache_directory():
             f"Expected: {allowed_dir}. Set PATHWAYS_ALLOW_UNSAFE_CACHE_DELETE=1 to override."
         )
     if not cache_dir.exists() or not cache_dir.is_dir():
-        raise ValueError(f"Cache directory does not exist or is not a directory: {cache_dir}")
+        raise ValueError(
+            f"Cache directory does not exist or is not a directory: {cache_dir}"
+        )
 
     allowed_suffixes = {".npy", ".npz", ".json", ".pkl"}
     removed = 0
@@ -793,7 +797,9 @@ def csv_to_dict(filename: str) -> dict[int, tuple[str, ...]]:
                     output_dict[int(value)] = key
                 except ValueError:
                     logging.warning(
-                        "Row %s has a non-integer index value '%s'; skipping.", row, value
+                        "Row %s has a non-integer index value '%s'; skipping.",
+                        row,
+                        value,
                     )
             else:
                 logging.warning(f"Row {row} has less than 5 items.")

tests/test_utilities.py

@@ -188,7 +188,9 @@ def test_clean_cache_directory(tmp_path, monkeypatch):
 
     clean_cache_directory()
 
-    assert not (cache_dir / "temp_cache_file.npy").exists(), "Cache file was not deleted"
+    assert not (
+        cache_dir / "temp_cache_file.npy"
+    ).exists(), "Cache file was not deleted"
     assert (
         non_cache_dir / "temp_non_cache_file"
     ).exists(), "Non-cache file was incorrectly deleted"
@@ -207,7 +209,12 @@ def test_clean_cache_directory_rejects_unsafe_path(tmp_path, monkeypatch):
 def test_apply_filters_path_matching_is_not_character_based():
     technosphere = {("alpha plant", "prod", "EU", "kg"): 1}
     filters = {"name_fltr": [], "name_mask": [], "product_fltr": [], "product_mask": []}
-    exceptions = {"name_fltr": [], "name_mask": [], "product_fltr": [], "product_mask": []}
+    exceptions = {
+        "name_fltr": [],
+        "name_mask": [],
+        "product_fltr": [],
+        "product_mask": [],
+    }
     paths = [["ab"]]
 
     _, _, filtered_names, _ = apply_filters(technosphere, filters, exceptions, paths)