You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by go...@apache.org on 2014/04/06 22:48:51 UTC
[1/2] git commit: CLIMATE-401 - Remove UnaryMetrics from UI settings
menu
Repository: climate
Updated Branches:
refs/heads/master a8054c4af -> e4c5ccca3
CLIMATE-401 - Remove UnaryMetrics from UI settings menu
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8a461063
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8a461063
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8a461063
Branch: refs/heads/master
Commit: 8a4610630e9681c0ffa822901ae0eff76a01c1f6
Parents: 0742e68
Author: Michael Joyce <jo...@apache.org>
Authored: Sun Apr 6 13:30:55 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Sun Apr 6 13:30:55 2014 -0700
----------------------------------------------------------------------
ocw-ui/backend/processing.py | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/8a461063/ocw-ui/backend/processing.py
----------------------------------------------------------------------
diff --git a/ocw-ui/backend/processing.py b/ocw-ui/backend/processing.py
index 5465d3a..2b70713 100644
--- a/ocw-ui/backend/processing.py
+++ b/ocw-ui/backend/processing.py
@@ -454,6 +454,12 @@ def _get_valid_metric_options():
:returns: A dictionary of metric (name, object) pairs
'''
invalid_metrics = ['ABCMeta', 'Metric', 'UnaryMetric', 'BinaryMetric']
+
+ # Consider all Unary Metrics invalid. At the moment, the UI cannot handle
+ # running Unary Metrics.
+ unary_metrics = [cls.__name__ for cls in metrics.UnaryMetric.__subclasses__()]
+ invalid_metrics += unary_metrics
+
return {name:obj
for name, obj in inspect.getmembers(metrics)
if inspect.isclass(obj) and name not in invalid_metrics}
[2/2] git commit: Merge branch 'CLIMATE-401' Fixes #19
Posted by go...@apache.org.
Merge branch 'CLIMATE-401'
Fixes #19
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/e4c5ccca
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/e4c5ccca
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/e4c5ccca
Branch: refs/heads/master
Commit: e4c5ccca39eec0293f92dd5ea9df2c8218f2f038
Parents: a8054c4 8a46106
Author: cgoodale <si...@gmail.com>
Authored: Sun Apr 6 13:48:30 2014 -0700
Committer: cgoodale <si...@gmail.com>
Committed: Sun Apr 6 13:48:30 2014 -0700
----------------------------------------------------------------------
ocw-ui/backend/processing.py | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------