Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74549
Change subject: moved creating mediawiki tables to only the tests
......................................................................
moved creating mediawiki tables to only the tests
Change-Id: Id807fa79262ee8461afc0e0e5014bf51ba17564f
---
M tests/fixtures.py
M wikimetrics/database.py
M wikimetrics/metrics/bytes_added.py
M wikimetrics/utils.py
4 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/49/74549/1
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 1df46f0..0c2d032 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -36,7 +36,11 @@
# create basic test records for non-mediawiki tests
self.session = db.get_session()
- self.mwSession = db.get_mw_session('enwiki')
+
+ project = 'enwiki'
+ engine = db.get_mw_engine(project)
+ db.MediawikiBase.metadata.create_all(engine, checkfirst=True)
+ self.mwSession = db.get_mw_session(project)
DatabaseTest.tearDown(self)
dan_user = User(username='Dan')
diff --git a/wikimetrics/database.py b/wikimetrics/database.py
index 6190049..a73617b 100644
--- a/wikimetrics/database.py
+++ b/wikimetrics/database.py
@@ -33,7 +33,7 @@
cluster_url_fmt = 'http://noc.wikimedia.org/conf/s{0}.dblist'
url = cluster_url_fmt.format(host_id)
projects = urlopen(url).read().splitlines()
- return (host_id, projects)
+ return (host_id, projects)
class Database(object):
@@ -100,7 +100,6 @@
else:
import wikimetrics.models.mediawiki
engine = self.get_mw_engine(project)
- self.MediawikiBase.metadata.create_all(engine, checkfirst=True)
project_sessionmaker = sessionmaker(engine)
self.mediawiki_sessionmakers[project] = project_sessionmaker
@@ -125,7 +124,6 @@
)
self.mediawiki_engines[project] = engine
return engine
-
def get_project_host_map(self, usecache=True):
"""
diff --git a/wikimetrics/metrics/bytes_added.py
b/wikimetrics/metrics/bytes_added.py
index 4c39b49..62bf6fb 100644
--- a/wikimetrics/metrics/bytes_added.py
+++ b/wikimetrics/metrics/bytes_added.py
@@ -93,7 +93,8 @@
BC = session.query(
Revision.rev_user,
- label('byte_change',
+ label(
+ 'byte_change',
cast(Revision.rev_len, Integer)
-
cast(func.coalesce(PreviousRevision.c.rev_len, 0), Integer)
diff --git a/wikimetrics/utils.py b/wikimetrics/utils.py
index 9d411d9..334ebff 100644
--- a/wikimetrics/utils.py
+++ b/wikimetrics/utils.py
@@ -63,4 +63,4 @@
def deduplicate(sequence):
seen = set()
seen_add = seen.add
- return [ x for x in sequence if x not in seen and not seen_add(x)]
+ return [x for x in sequence if x not in seen and not seen_add(x)]
--
To view, visit https://gerrit.wikimedia.org/r/74549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id807fa79262ee8461afc0e0e5014bf51ba17564f
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
