Fix #46 while we are at it

OSeMOSYS · Jun 15, 2020 · 70ec08f · 70ec08f
1 parent 1d840e6
commit 70ec08f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/otoole/cli.py b/src/otoole/cli.py
@@ -158,15 +158,23 @@ def conversion_matrix(args):
             raise NotImplementedError(msg)
 
     elif args.from_format == "excel":
+
         if args.to_format == "csv":
             generate_csv_from_excel(args.from_path, args.to_path)
+
         elif args.to_format == "datafile":
 
             with TemporaryDirectory() as temp_folder:
                 generate_csv_from_excel(args.from_path, temp_folder)
                 csv_to_datapackage(temp_folder)
                 from_path = os.path.join(temp_folder, "datapackage.json")
                 convert_datapackage_to_datafile(from_path, args.to_path)
+
+        elif args.to_format == "datapackage":
+            with TemporaryDirectory() as temp_folder:
+                generate_csv_from_excel(args.from_path, temp_folder)
+                csv_to_datapackage(temp_folder)
+
         else:
             raise NotImplementedError(msg)
 

diff --git a/src/otoole/preprocess/excel_to_osemosys.py b/src/otoole/preprocess/excel_to_osemosys.py
@@ -228,7 +228,7 @@ def read_config(path_to_user_config: str = None) -> Dict:
 
 
 def generate_csv_from_excel(input_workbook, output_folder):
-    """Generate a folder of CSV files from a spreadsheet
+    """Generate a folder of narrow, well formatted CSV files from a spreadsheet
 
     Arguments
     ---------