check the input data for "unit"

iiasa · Apr 3, 2020 · 0663c65 · 0663c65
1 parent 9ca3acd
commit 0663c65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/message_ix/macro.py b/message_ix/macro.py
@@ -124,7 +124,7 @@ def validate(kind, values, df):
         cols = MACRO_DATA_FOR_DERIVATION[name]
     else:
         cols = MACRO_ITEMS[name]['idx_sets']
-    col_diff = set(cols) - set(df.columns)
+    col_diff = set(cols + ['unit']) - set(df.columns)
     if col_diff:
         msg = 'Missing expected columns for {}: {}'
         raise ValueError(msg.format(name, col_diff))

diff --git a/message_ix/tests/test_macro.py b/message_ix/tests/test_macro.py
@@ -86,7 +86,7 @@ def test_config(westeros_solved):
 
     # removing a column from config and testing
     data = c.data.copy()
-    data['config'] =  c.data['config'][['node', 'sector']]
+    data['config'] = c.data['config'][['node', 'sector']]
     try:
         macro.Calculate(s, data)
     except KeyError as error: