Merge remote-tracking branch 'origin/master'

polca · Aug 28, 2024 · 8ef28f0 · 8ef28f0
2 parents 43c8fd8 + 1c2814c
commit 8ef28f0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/premise/inventory_imports.py b/premise/inventory_imports.py
@@ -858,7 +858,11 @@ def load_inventory(self) -> bw2io.ExcelImporter:
     def prepare_inventory(self) -> None:
         if self.version_in != self.version_out:
             # if version_out is 3.9 or 3.10, migrate towards 3.8 first, then 3.9 or 3.10
-            if self.version_out in ["3.9", "3.9.1", "3.10"] and self.version_in in ["3.5", "3.6", "3.7"]:
+            if self.version_out in ["3.9", "3.9.1", "3.10"] and self.version_in in [
+                "3.5",
+                "3.6",
+                "3.7",
+            ]:
                 print("Migrating to 3.8 first")
                 self.import_db.migrate(
                     f"migration_{self.version_in.replace('.', '')}_38"
@@ -947,7 +951,11 @@ def load_inventory(self):
     def prepare_inventory(self):
         # if version_out is 3.9, migrate towards 3.8 first, then 3.9
         if self.version_out in ["3.9", "3.9.1", "3.10"]:
-            if self.version_out in ["3.9", "3.9.1", "3.10"] and self.version_in in ["3.5", "3.6", "3.7"]:
+            if self.version_out in ["3.9", "3.9.1", "3.10"] and self.version_in in [
+                "3.5",
+                "3.6",
+                "3.7",
+            ]:
                 print("Migrating to 3.8 first")
                 self.import_db.migrate(
                     f"migration_{self.version_in.replace('.', '')}_38"
@@ -1023,7 +1031,11 @@ def load_inventory(self):
     def prepare_inventory(self):
         if str(self.version_in) != self.version_out:
             # if version_out is 3.9 or 3.10, migrate towards 3.8 first, then 3.9/3.10
-            if self.version_out in ["3.9", "3.9.1", "3.10"] and self.version_in in ["3.5", "3.6", "3.7"]:
+            if self.version_out in ["3.9", "3.9.1", "3.10"] and self.version_in in [
+                "3.5",
+                "3.6",
+                "3.7",
+            ]:
                 print("Migrating to 3.8 first")
                 self.import_db.migrate(
                     f"migration_{self.version_in.replace('.', '')}_38"

diff --git a/premise/validation.py b/premise/validation.py
@@ -185,7 +185,6 @@ def check_matrix_squareness(self):
                 f"WARNING: matrix is not square: {len(list(set(activities)))} activities, {len(list(set(products)))} products."
             )
 
-
     def check_uncertainty(self):
         MANDATORY_UNCERTAINTY_FIELDS = {
             2: {"loc", "scale"},