Merge pull request #389 from khaeru/hotfix/reporting-concat

Fix passthrough of reporting.pyam.concat() args
khaeru · Aug 20, 2020 · 9586972 · 9586972
2 parents c86286a + 02cb3e2
commit 9586972
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/message_ix/reporting/pyam.py b/message_ix/reporting/pyam.py
@@ -90,12 +90,15 @@ def as_pyam(scenario, quantity, replace_vars=None, year_time_dim=None,
 
 # Computations that operate on pyam.IamDataFrame inputs
 
-def concat(*args):
+def concat(*args, **kwargs):
     """Concatenate *args*, which must all be :class:`pyam.IamDataFrame`."""
     if isinstance(args[0], IamDataFrame):
-        return pyam_concat(args)
+        # pyam.concat() takes an iterable of args
+        return pyam_concat(args, **kwargs)
     else:
-        return ixmp_concat(args)
+        # ixmp.reporting.computations.concat() takes a variable number of
+        # positional arguments
+        return ixmp_concat(*args, **kwargs)
 
 
 def write_report(quantity, path):