Rfaulk has submitted this change and it was merged.
Change subject: fix - refs to aggregator constants.
......................................................................
fix - refs to aggregator constants.
Change-Id: Id8c5fe2cf447f1abd2f7c96a7f79bd9308990247
---
M user_metrics/etl/aggregator.py
M user_metrics/metrics/blocks.py
2 files changed, 6 insertions(+), 10 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
diff --git a/user_metrics/etl/aggregator.py b/user_metrics/etl/aggregator.py
index 50e3a92..6d165b7 100644
--- a/user_metrics/etl/aggregator.py
+++ b/user_metrics/etl/aggregator.py
@@ -53,10 +53,6 @@
from collections import namedtuple
from itertools import izip
from numpy import array, transpose
-from user_metrics.metrics.user_metric import METRIC_AGG_METHOD_FLAG, \
- METRIC_AGG_METHOD_HEAD, \
- METRIC_AGG_METHOD_KWARGS, \
- METRIC_AGG_METHOD_NAME
# Type used to carry aggregator meta data
AggregatorMeta = namedtuple('AggregatorMeta', 'field_name index op')
diff --git a/user_metrics/metrics/blocks.py b/user_metrics/metrics/blocks.py
index ecea99c..2438432 100644
--- a/user_metrics/metrics/blocks.py
+++ b/user_metrics/metrics/blocks.py
@@ -5,7 +5,7 @@
from collections import namedtuple
from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG, \
- METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD, METRIC_AGG_METHOD_KWARGS
from user_metrics.metrics import user_metric as um
from user_metrics.metrics import query_mod
from user_metrics.etl.aggregator import weighted_rate, decorator_builder,\
@@ -143,12 +143,12 @@
block_rate_agg = weighted_rate
block_rate_agg = decorator_builder(Blocks.header())(block_rate_agg)
-setattr(block_rate_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(block_rate_agg, um.METRIC_AGG_METHOD_NAME, 'b_rate_agg')
-setattr(block_rate_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(block_rate_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(block_rate_agg, METRIC_AGG_METHOD_NAME, 'b_rate_agg')
+setattr(block_rate_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'total_weight',
'rate'])
-setattr(block_rate_agg, um.METRIC_AGG_METHOD_KWARGS, {
+setattr(block_rate_agg, METRIC_AGG_METHOD_KWARGS, {
'val_idx': 2,
})
@@ -161,7 +161,7 @@
setattr(block_prop_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'total_blocks',
'proportion'])
-setattr(block_prop_agg, um.METRIC_AGG_METHOD_KWARGS, {
+setattr(block_prop_agg, METRIC_AGG_METHOD_KWARGS, {
'val_idx': 1,
})
--
To view, visit https://gerrit.wikimedia.org/r/80535
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8c5fe2cf447f1abd2f7c96a7f79bd9308990247
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
