Merge remote-tracking branch 'origin/master'

polca · Jul 29, 2023 · 5e3cec9 · 5e3cec9
2 parents fd0716e + 27fceb2
commit 5e3cec9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/premise/electricity.py b/premise/electricity.py
@@ -1463,7 +1463,8 @@ def create_biomass_markets(self) -> None:
             }
 
             available_biomass_vars = [
-                v for v in list(biomass_map.keys())
+                v
+                for v in list(biomass_map.keys())
                 if v in self.iam_data.production_volumes.variables.values
             ]
 
@@ -1481,7 +1482,6 @@ def create_biomass_markets(self) -> None:
                 )
 
                 if biomass_type in available_biomass_vars:
-
                     share = np.clip(
                         (
                             self.iam_data.production_volumes.sel(

diff --git a/premise/export.py b/premise/export.py
@@ -811,12 +811,7 @@ def generate_scenario_difference_file(
 
 
 def generate_superstructure_db(
-    origin_db,
-    scenarios,
-    db_name,
-    filepath,
-    version,
-    format="excel"
+    origin_db, scenarios, db_name, filepath, version, format="excel"
 ) -> List[dict]:
     """
     Build a superstructure database from a list of databases

diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@ def package_files(directory):
         "requests",
         "bottleneck",
         "constructive_geometries>=0.8.2",
-        "pyarrow"
+        "pyarrow",
     ],
     url="https://github.com/polca/premise",
     description="Coupling IAM output to ecoinvent LCA database ecoinvent for prospective LCA",