bodhi/tools
by Luke Macken
bodhi/tools/metrics.py | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 98dac02844ef5722c42f536d6020305edca8979f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 30 17:21:28 2011 -0400
Track proventester karma in our metrics.py
diff --git a/bodhi/tools/metrics.py b/bodhi/tools/metrics.py
index 5fe6342..bd40eff 100755
--- a/bodhi/tools/metrics.py
+++ b/bodhi/tools/metrics.py
@@ -51,6 +51,9 @@ def main():
'accumulative': timedelta(),
'packages': defaultdict(int),
'proventesters': set(),
+ 'proventesters_1': 0,
+ 'proventesters_0': 0,
+ 'proventesters_-1': 0,
# for tracking number of types of karma
'1': 0,
'0': 0,
@@ -85,6 +88,7 @@ def main():
if comment.author_group == 'proventesters':
data['proventesters'].add(comment.author_name)
+ data['proventesters_%d' % comment.karma] += 1
# For figuring out if an update has received feedback or not
if not feedback_done:
@@ -161,6 +165,8 @@ def main():
print " * %d unique authenticated karma submitters" % (
len(data['karma']))
print " * %d proventesters" % len(data['proventesters'])
+ print " * %d +1's from proventesters" % data['proventesters_1']
+ print " * %d -1's from proventesters" % data['proventesters_-1']
print " * %d anonymous users gave feedback (%0.2f%%)" % (
data['num_anon_feedback'], float(data['num_anon_feedback']) /
(data['num_anon_feedback'] + sum(data['karma'].values())) * 100)
13 years
bodhi/config bodhi/controllers.py bodhi/model.py
by Luke Macken
bodhi/config/app.cfg | 4 ++++
bodhi/controllers.py | 29 +++++++++++++++--------------
bodhi/model.py | 2 +-
3 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit f599d577338f8f4fb09cda94ea8ea3b61d8dc54b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 30 17:05:11 2011 -0400
Make our test case query optional
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index abadb42..6cd2684 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -18,6 +18,10 @@ newupdate_notice = ''
stablekarma_comment = 'This update has reached the stable karma threshold and will be pushed to the stable updates repository'
+## Query the wiki for test cases
+query_wiki_test_cases = False
+wiki_url = 'https://fedoraproject.org/w/api.php'
+
##
## Mash settings
##
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index d6e98e9..bd33c66 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -965,20 +965,21 @@ class Root(controllers.RootController):
break
# Append links to unit tests in the update notes
- try:
- test_cases = []
- for build in update.builds:
- test_cases.extend(build.package.get_test_cases())
- # HACK: shove the unit tests into this PickleCol
- if test_cases:
- if not update.nagged:
- nagged = {}
- else:
- nagged = update.nagged
- nagged['test_cases'] = test_cases
- update.nagged = nagged
- except Exception, e:
- log.exception(e)
+ if config.get('query_wiki_test_cases'):
+ try:
+ test_cases = []
+ for build in update.builds:
+ test_cases.extend(build.package.get_test_cases())
+ # HACK: shove the unit tests into this PickleCol
+ if test_cases:
+ if not update.nagged:
+ nagged = {}
+ else:
+ nagged = update.nagged
+ nagged['test_cases'] = test_cases
+ update.nagged = nagged
+ except Exception, e:
+ log.exception(e)
# Send out mail notifications
if edited:
diff --git a/bodhi/model.py b/bodhi/model.py
index c019e0f..576b27f 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -181,7 +181,7 @@ class Package(SQLObject):
def get_test_cases(self):
""" Get a list of test cases from the wiki """
from simplemediawiki import MediaWiki
- wiki = MediaWiki('https://fedoraproject.org/w/api.php')
+ wiki = MediaWiki(config.get('wiki_url', 'https://fedoraproject.org/w/api.php'))
cat_page = 'Category:Package %s test cases' % self.name
limit = 10
13 years
bodhi/config
by Luke Macken
bodhi/config/app.cfg | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 61c3440153a2a5ad21a76b5fab122b96829532d1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Mar 29 17:28:42 2011 -0400
Document bodhi's new arch handling code
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index 53abdec..abadb42 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -62,6 +62,15 @@ base_address = 'http://localhost:8084'
update_types = 'bugfix enhancement security newpackage'
## Supported architechures
+##
+## To handle arch name changes between releases, you
+## can also configure bodhi to support one arch *or*
+## another. For example, EPEL5 mashes produce 'ppc'
+## repos, where EPEL6 produces 'ppc64'. To handle this
+## scenario, you can specify something like:
+##
+## arches = 'ppc/ppc64'
+##
arches = 'i386 x86_64 ppc'
##
13 years
2 commits - bodhi/model.py bodhi/util.py
by Luke Macken
bodhi/model.py | 2 +-
bodhi/util.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 29d82128abbb3ec74b1db884da3ef9a7693898cf
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Mar 25 13:27:27 2011 -0400
Hack around urlgrabber's inability to handle unicode strings
diff --git a/bodhi/util.py b/bodhi/util.py
index 76c10b2..c6c73a8 100644
--- a/bodhi/util.py
+++ b/bodhi/util.py
@@ -393,6 +393,7 @@ def sanity_check_repodata(myurl):
Sanity check the repodata for a given repository.
Initial implementation by Seth Vidal.
"""
+ myurl = str(myurl)
tempdir = tempfile.mkdtemp()
errorstrings = []
if myurl[-1] != '/':
commit c36b6b6eff5132f6e7c87bc69d260a9c338471bf
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Mar 25 13:27:10 2011 -0400
Fix a bug in our bugzilla commenting code
diff --git a/bodhi/model.py b/bodhi/model.py
index 52420da..c019e0f 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -1335,7 +1335,7 @@ class Bugzilla(SQLObject):
repo = 'epel-testing'
message = self.testing_msg % (
update.get_title(delim=', '),
- release.long_name, repo, update.get_title(), reboot,
+ update.release.long_name, repo, update.get_title(), reboot,
config.get('base_address') + tg_url(update.get_url()))
else:
message = self.stable_msg % (update.get_title(delim=', '),
13 years
bodhi.egg-info/PKG-INFO bodhi/release.py bodhi.spec
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.spec | 2 +-
bodhi/release.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 702c445bbb1d6be083af1c0d27f0b9e79dcd8cef
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 24 16:27:43 2011 -0400
0.7.15
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 7dc8dfc..b673b50 100644
--- a/bodhi.egg-info/PKG-INFO
+++ b/bodhi.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: bodhi
-Version: 0.7.14
+Version: 0.7.15
Summary: Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution
Home-page: https://fedorahosted.org/bodhi
Author: Luke Macken
diff --git a/bodhi.spec b/bodhi.spec
index de555c9..b104095 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,7 +2,7 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: bodhi
-Version: 0.7.14
+Version: 0.7.15
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
diff --git a/bodhi/release.py b/bodhi/release.py
index 900fb24..1f5bb51 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.14'
+VERSION = '0.7.15'
NAME = 'bodhi'
DESCRIPTION = 'Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution'
AUTHOR = 'Luke Macken'
13 years
Changes to 'refs/tags/0.7.15'
by Luke Macken
Tag '0.7.15' created by Luke Macken <lmacken(a)redhat.com> at 2011-03-24 20:27 +0000
0.7.15
Changes since 0.7.14:
Luke Macken (5):
Hardcode our defaultview to kid
Get a broken unit test working
Remove the pending tags from builds that are removed during an edit.
Tweak our fix for #416 by only adding the dist tag to branched updates when
0.7.15
---
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.spec | 2 +-
bodhi/config/app.cfg | 4 ++--
bodhi/controllers.py | 8 ++++++++
bodhi/masher.py | 5 ++++-
bodhi/release.py | 2 +-
bodhi/tests/test_controllers.py | 2 +-
7 files changed, 18 insertions(+), 7 deletions(-)
---
13 years
bodhi/masher.py
by Luke Macken
bodhi/masher.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 6402bad40bb587934ae6a126fa35c86be4ccf3ac
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 24 16:22:13 2011 -0400
Tweak our fix for #416 by only adding the dist tag to branched updates when
they are going to stable only.
This will prevent builds from going out with -pending tags that don't get
removed.
diff --git a/bodhi/masher.py b/bodhi/masher.py
index f1f6c0d..0340b21 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -441,7 +441,10 @@ class MashTask(Thread):
self.tag = update.release.candidate_tag
current_tag = update.get_build_tag()
for build in update.builds:
- if build.inherited or update.release.locked:
+ if build.inherited:
+ log.debug("Adding tag %s to %s" % (self.tag, build.nvr))
+ self.koji.tagBuild(self.tag, build.nvr, force=True)
+ elif update.release.locked and update.request == 'stable':
log.debug("Adding tag %s to %s" % (self.tag, build.nvr))
self.koji.tagBuild(self.tag, build.nvr, force=True)
else:
13 years
2 commits - bodhi/controllers.py bodhi/tests
by Luke Macken
bodhi/controllers.py | 8 ++++++++
bodhi/tests/test_controllers.py | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit b12c324072823df7ee1afe7b681f1d0df2f6c97b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 24 15:31:27 2011 -0400
Remove the pending tags from builds that are removed during an edit.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index ea846e9..d6e98e9 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -715,6 +715,14 @@ class Root(controllers.RootController):
if build not in builds:
removed_builds.append(build)
+ # Remove the appropriate pending tags
+ if edited.request == 'stable':
+ koji.untagBuild(edited.release.pending_stable_tag,
+ build, force=True)
+ elif edited.request == 'testing':
+ koji.untagBuild(edited.release.pending_testing_tag,
+ build, force=True)
+
# Comment on the update with details of added/removed builds
if new_builds or removed_builds:
comment = '%s has edited this update. ' % identity.current.user_name
commit 047fda401924db727406fad1638546722c4f6573
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 24 15:30:36 2011 -0400
Get a broken unit test working
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index b95faba..7a4d868 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -921,7 +921,7 @@ class TestControllers(testutil.DBTest):
self.save_update(newparams, session)
newupdate = PackageUpdate.byTitle(newparams['builds'])
assert newupdate.status == 'pending'
- assert newupdate.notes == ''
+ assert newupdate.notes in ('', None), newupdate.notes
update = PackageUpdate.byTitle(','.join(params['builds'].split()))
assert update.status == 'testing', update.status
13 years
bodhi/config
by Luke Macken
bodhi/config/app.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9fa990d985f464017d604aab1c1611fecc5fc712
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 24 15:12:35 2011 -0400
Hardcode our defaultview to kid
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index 1feaf50..53abdec 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -202,14 +202,14 @@ feeds.max_entries = 20
# which view (template engine) to use if one is not specified in the
# template name
-# tg.defaultview = "kid"
+tg.defaultview = "kid"
# The following kid settings determine the settings used by the kid serializer.
# One of (html|xml|json)
# kid.outputformat="html"
-# kid.encoding="utf-8"
+kid.encoding="utf-8"
# The sitetemplate is used for overall styling of a site that
# includes multiple TurboGears applications
13 years