Merge remote-tracking branch 'origin/master'

polca · Oct 10, 2024 · c969395 · c969395
2 parents 10f8557 + 718ea6d
commit c969395
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 50 deletions.
diff --git a/premise/fuels.py b/premise/fuels.py
@@ -2352,7 +2352,7 @@ def generate_regional_fuel_market(
                 # so that the overall composition maintains
                 # the same average LHV
                 amount = supplier_share * (
-                        activity["lhv"] / self.fuels_specs[prod_var]["lhv"]
+                    activity["lhv"] / self.fuels_specs[prod_var]["lhv"]
                 )
 
                 lhv = self.fuels_specs[prod_var]["lhv"]

diff --git a/tests/test_process_ei310_EN15804.py b/tests/test_process_ei310_EN15804.py
@@ -62,13 +62,7 @@ def test_brightway():
     if "test3" in bw2data.databases:
         del bw2data.databases["test3"]
 
-    ndb.write_db_to_brightway(
-        [
-            "test1",
-            "test2",
-            "test3"
-        ]
-    )
+    ndb.write_db_to_brightway(["test1", "test2", "test3"])
 
     method = [m for m in bw2data.methods if "IPCC" in m[0]][0]
 

diff --git a/tests/test_process_ei310_conseq.py b/tests/test_process_ei310_conseq.py
@@ -63,13 +63,7 @@ def test_brightway():
     if "test3" in bw2data.databases:
         del bw2data.databases["test3"]
 
-    ndb.write_db_to_brightway(
-        [
-            "test1",
-            "test2",
-            "test3"
-        ]
-    )
+    ndb.write_db_to_brightway(["test1", "test2", "test3"])
 
     method = [m for m in bw2data.methods if "IPCC" in m[0]][0]
 

diff --git a/tests/test_process_ei310_cutoff.py b/tests/test_process_ei310_cutoff.py
@@ -58,13 +58,7 @@ def test_brightway():
     if "test3" in bw2data.databases:
         del bw2data.databases["test3"]
 
-    ndb.write_db_to_brightway(
-        [
-            "test1",
-            "test2",
-            "test3"
-        ]
-    )
+    ndb.write_db_to_brightway(["test1", "test2", "test3"])
 
     method = [m for m in bw2data.methods if "IPCC" in m[0]][0]
 

diff --git a/tests/test_process_ei38_conseq.py b/tests/test_process_ei38_conseq.py
@@ -63,13 +63,7 @@ def test_brightway():
     if "test3" in bw2data.databases:
         del bw2data.databases["test3"]
 
-    ndb.write_db_to_brightway(
-        [
-            "test1",
-            "test2",
-            "test3"
-        ]
-    )
+    ndb.write_db_to_brightway(["test1", "test2", "test3"])
 
     method = [m for m in bw2data.methods if "IPCC" in m[0]][0]
 

diff --git a/tests/test_process_ei38_cutoff.py b/tests/test_process_ei38_cutoff.py
@@ -62,13 +62,7 @@ def test_brightway():
     if "test3" in bw2data.databases:
         del bw2data.databases["test3"]
 
-    ndb.write_db_to_brightway(
-        [
-            "test1",
-            "test2",
-            "test3"
-        ]
-    )
+    ndb.write_db_to_brightway(["test1", "test2", "test3"])
 
     method = [m for m in bw2data.methods if "IPCC" in m[0]][0]
 

diff --git a/tests/test_process_ei39_conseq.py b/tests/test_process_ei39_conseq.py
@@ -63,13 +63,7 @@ def test_brightway():
     if "test3" in bw2data.databases:
         del bw2data.databases["test3"]
 
-    ndb.write_db_to_brightway(
-        [
-            "test1",
-            "test2",
-            "test3"
-        ]
-    )
+    ndb.write_db_to_brightway(["test1", "test2", "test3"])
 
     method = [m for m in bw2data.methods if "IPCC" in m[0]][0]
 

diff --git a/tests/test_process_ei39_cutoff.py b/tests/test_process_ei39_cutoff.py
@@ -62,13 +62,7 @@ def test_brightway():
     if "test3" in bw2data.databases:
         del bw2data.databases["test3"]
 
-    ndb.write_db_to_brightway(
-        [
-            "test1",
-            "test2",
-            "test3"
-        ]
-    )
+    ndb.write_db_to_brightway(["test1", "test2", "test3"])
 
     method = [m for m in bw2data.methods if "IPCC" in m[0]][0]