Merge branch 'master' of github.com:cyclus/cymetric

cyclus · Jan 12, 2018 · 9feba4a · 9feba4a
2 parents 4b13328 + 3400892
commit 9feba4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,3 +4,15 @@ cymetric Change Log
 
 .. current developments
 
+v1.5.3
+====================
+
+**Changed:**
+
+* **MAJOR BACKWARDS INCOMPATIBLE CHANGE:** metrics now accept DataFrames, not Series.
+  Additionally, the number of arguments in a metric should be equal to the dependencies.
+  Dependencies are unpacked into the metric function call.
+
+
+
+
diff --git a/news/s2df.rst b/news/s2df.rst