Merge remote-tracking branch 'origin/pathways' into pathways

polca · Jul 27, 2024 · da95aba · da95aba
2 parents 101a52d + 28be21e
commit da95aba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/premise/data/additional_inventories/lci-PV-GaAs.xlsx b/premise/data/additional_inventories/lci-PV-GaAs.xlsx
diff --git a/premise/data/additional_inventories/lci-PV-perovskite.xlsx b/premise/data/additional_inventories/lci-PV-perovskite.xlsx
diff --git a/premise/data/additional_inventories/lci-vanadium.xlsx b/premise/data/additional_inventories/lci-vanadium.xlsx
diff --git a/premise/new_database.py b/premise/new_database.py
@@ -181,6 +181,8 @@
 FILEPATH_TRUCKS = INVENTORY_DIR / "lci-trucks.xlsx"
 FILEPATH_BUSES = INVENTORY_DIR / "lci-buses.xlsx"
 FILEPATH_PASS_CARS = INVENTORY_DIR / "lci-pass_cars.xlsx"
+FILEPATH_PV_GAAS = INVENTORY_DIR / "lci-PV-GaAs.xlsx"
+FILEPATH_PV_PEROVSKITE = INVENTORY_DIR / "lci-PV-perovskite.xlsx"
 
 config = load_constants()
 
@@ -780,6 +782,8 @@ def __import_inventories(self) -> List[dict]:
             (FILEPATH_TRUCKS, "3.7"),
             (FILEPATH_BUSES, "3.7"),
             (FILEPATH_PASS_CARS, "3.7"),
+            (FILEPATH_PV_GAAS, "3.10"),
+            (FILEPATH_PV_PEROVSKITE, "3.10"),
         ]
         for filepath in filepaths:
             # make an exception for FILEPATH_OIL_GAS_INVENTORIES