From 851a78f8b9948d777e38b1efff2877c73da5ef7b Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Thu, 11 Jan 2018 16:16:41 -0500 Subject: [PATCH 1/6] Updated CHANGELOG for 1.5.3 --- CHANGELOG.rst | 12 ++++++++++++ news/s2df.rst | 15 --------------- 2 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 news/s2df.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e9a51482..8090bc74 100644 --- 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 deleted file mode 100644 index cb1a1eb4..00000000 --- a/news/s2df.rst +++ /dev/null @@ -1,15 +0,0 @@ -**Added:** None - -**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. - -**Deprecated:** None - -**Removed:** None - -**Fixed:** None - -**Security:** None From c857aaf52a88f346f86cd91a177c93c89aba47e4 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Thu, 11 Jan 2018 16:19:57 -0500 Subject: [PATCH 2/6] rever uses cycamore not cymetric --- rever.xsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rever.xsh b/rever.xsh index 9f01b6e3..5ba2916b 100644 --- a/rever.xsh +++ b/rever.xsh @@ -5,7 +5,7 @@ $ACTIVITIES = ['changelog', 'nose', 'tag', 'push_tag', 'conda_forge', 'ghrelease $CHANGELOG_FILENAME = 'CHANGELOG.rst' $CHANGELOG_TEMPLATE = 'TEMPLATE.rst' -$DOCKER_CONDA_DEPS = ['cyclus', 'cymetric', 'nose', 'pytables'] +$DOCKER_CONDA_DEPS = ['cyclus', 'cycamore', 'nose', 'pytables'] $DOCKER_INSTALL_COMMAND = 'git clean -fdx && ./setup.py install --user' $VERSION_BUMP_PATTERNS = [ From a94d17f49e20d8f9d0d9dd06045d6e489827da45 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Thu, 11 Jan 2018 16:31:17 -0500 Subject: [PATCH 3/6] more deps --- rever.xsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rever.xsh b/rever.xsh index 5ba2916b..031c3a1c 100644 --- a/rever.xsh +++ b/rever.xsh @@ -5,7 +5,8 @@ $ACTIVITIES = ['changelog', 'nose', 'tag', 'push_tag', 'conda_forge', 'ghrelease $CHANGELOG_FILENAME = 'CHANGELOG.rst' $CHANGELOG_TEMPLATE = 'TEMPLATE.rst' -$DOCKER_CONDA_DEPS = ['cyclus', 'cycamore', 'nose', 'pytables'] +$DOCKER_CONDA_DEPS = ['cyclus', 'cycamore', 'nose', 'pytables', 'pandas', + 'python-graphviz', 'pyne', 'numpy'] $DOCKER_INSTALL_COMMAND = 'git clean -fdx && ./setup.py install --user' $VERSION_BUMP_PATTERNS = [ From bcb60846a077d39b98b940b9a541e9dd98fb444c Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Thu, 11 Jan 2018 16:41:54 -0500 Subject: [PATCH 4/6] go to tests dir --- rever.xsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rever.xsh b/rever.xsh index 031c3a1c..1d97392f 100644 --- a/rever.xsh +++ b/rever.xsh @@ -7,7 +7,7 @@ $CHANGELOG_TEMPLATE = 'TEMPLATE.rst' $DOCKER_CONDA_DEPS = ['cyclus', 'cycamore', 'nose', 'pytables', 'pandas', 'python-graphviz', 'pyne', 'numpy'] -$DOCKER_INSTALL_COMMAND = 'git clean -fdx && ./setup.py install --user' +$DOCKER_INSTALL_COMMAND = 'git clean -fdx && cd tests && ./setup.py install --user' $VERSION_BUMP_PATTERNS = [ ('cymetric/__init__.py', '__version__\s*=.*', "__version__ = '$VERSION'"), From 6c5b9aa4ab6df5fe6bfd1047159184703c7640ab Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Thu, 11 Jan 2018 16:54:15 -0500 Subject: [PATCH 5/6] test removal --- rever.xsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rever.xsh b/rever.xsh index 1d97392f..ad5d3c86 100644 --- a/rever.xsh +++ b/rever.xsh @@ -7,9 +7,11 @@ $CHANGELOG_TEMPLATE = 'TEMPLATE.rst' $DOCKER_CONDA_DEPS = ['cyclus', 'cycamore', 'nose', 'pytables', 'pandas', 'python-graphviz', 'pyne', 'numpy'] -$DOCKER_INSTALL_COMMAND = 'git clean -fdx && cd tests && ./setup.py install --user' +$DOCKER_INSTALL_COMMAND = 'git clean -fdx && ./setup.py install --user' $VERSION_BUMP_PATTERNS = [ ('cymetric/__init__.py', '__version__\s*=.*', "__version__ = '$VERSION'"), ('setup.py', 'VERSION\s*=.*', "VERSION = '$VERSION'"), ] + +$NOSE_COMMAND = 'cd tests/ && rm test_filters.py && nosetests -w tests' From 34008926caf67553badbc2c7426ef980f79fa414 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Thu, 11 Jan 2018 16:54:47 -0500 Subject: [PATCH 6/6] change test wd --- rever.xsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rever.xsh b/rever.xsh index ad5d3c86..e08485d9 100644 --- a/rever.xsh +++ b/rever.xsh @@ -14,4 +14,4 @@ $VERSION_BUMP_PATTERNS = [ ('setup.py', 'VERSION\s*=.*', "VERSION = '$VERSION'"), ] -$NOSE_COMMAND = 'cd tests/ && rm test_filters.py && nosetests -w tests' +$NOSE_COMMAND = 'cd tests/ && rm test_filters.py && nosetests'