Merge remote-tracking branch 'origin/main'

Author: romainsacchi

pathways/jacobi_gmres_multi_lca.py

@@ -188,8 +188,7 @@ def lci_calculation(self) -> None:
             [
                 (
                     name,
-                    self.biosphere_matrix
-                    @ sparse.spdiags([arr], [0], count, count),
+                    self.biosphere_matrix @ sparse.spdiags([arr], [0], count, count),
                 )
                 for name, arr in self.supply_arrays.items()
             ]

pathways/utils.py

@@ -313,7 +313,9 @@ def create_lca_results_array(
     aggregate_by = set(aggregate_by or [])
 
     coords = {
-        "act_category": ["aggregated"] if "act_category" in aggregate_by else act_categories,
+        "act_category": (
+            ["aggregated"] if "act_category" in aggregate_by else act_categories
+        ),
         "variable": list(mapping.keys()),
         "year": years,
         "region": regions,

tests/test_lca.py

@@ -332,8 +332,12 @@ def test_jacobi_gmres_multilca_solves_multiple_demands():
 
     lca.lci_calculation()
 
-    expected_a = np.linalg.solve(lca.technosphere_matrix.toarray(), np.array([1.0, 0.0]))
-    expected_b = np.linalg.solve(lca.technosphere_matrix.toarray(), np.array([0.0, 1.0]))
+    expected_a = np.linalg.solve(
+        lca.technosphere_matrix.toarray(), np.array([1.0, 0.0])
+    )
+    expected_b = np.linalg.solve(
+        lca.technosphere_matrix.toarray(), np.array([0.0, 1.0])
+    )
 
     assert np.allclose(lca.supply_arrays["a"], expected_a)
     assert np.allclose(lca.supply_arrays["b"], expected_b)