Merge lp:~elachuni/ubuntu-webcatalog/bzr-revno into lp:ubuntu-webcatalog

[Anthony Lenton]

This branch adds the bzr branch rev. number to the list of reported versions on the preflight page.
Now that we're rolling out to staging faster than you can say 'ping webops', we need this :)

[Michael Nelson (michael.nelson)]

Is the hard-coded 13.02 really necessary?

review: Approve

[Natalia Bidart (nataliabidart)]

Setting MP as Rejected to reduce numbers of landing candidates in @reviewlist.
Change status again if this MP is still current.

Unmerged revisions

180. By Anthony Lenton on 2013-03-01

Fixed preflight test.

179. By Anthony Lenton on 2013-03-01

Added bzr revno to reported versions in preflight.

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2013-02-28 16:23:58 +0000
+++ django_project/config/main.cfg	2013-03-01 19:16:20 +0000
@@ -140,3 +140,6 @@
 celery_imports = webcatalog.tasks
 celery_result_backend = database
 celerybeat_scheduler = djcelery.schedulers.DatabaseScheduler
+
+[preflight]
+preflight_groups = developers

=== modified file 'setup.py'
--- setup.py	2013-02-28 16:23:58 +0000
+++ setup.py	2013-03-01 19:16:20 +0000
@@ -33,6 +33,7 @@
     packages = find_packages('src'),
     package_dir = {'': 'src'},
     install_requires = [
+        'bzr',
         'django',
         'setuptools',
         'south==0.7.3',

=== modified file 'src/webcatalog/__init__.py'
--- src/webcatalog/__init__.py	2012-06-28 14:28:26 +0000
+++ src/webcatalog/__init__.py	2013-03-01 19:16:20 +0000
@@ -1,6 +1,6 @@
 #   -*- coding: utf-8 -*-
 #   This file is part of the Apps Directory
-#   Copyright (C) 2011 Canonical Ltd.
+#   Copyright (C) 2011-2013 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as
@@ -15,4 +15,24 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '12.06.2; r136'
+
+def _get_revno(path):
+    import bzrlib.errors
+    import bzrlib.workingtree
+    try:
+        t = bzrlib.workingtree.WorkingTree.open_containing(path)[0]
+    except (bzrlib.errors.NotBranchError, bzrlib.errors.NoWorkingTree):
+        return None
+    else:
+        return t.branch.revno()
+
+
+def _version_for_path(path):
+    revno = _get_revno(path)
+    if revno is None:
+        return "unknown"
+    else:
+        return '13.02 r%s' % (revno,)
+
+
+__version__ = _version_for_path(__file__)

=== modified file 'src/webcatalog/preflight.py'
--- src/webcatalog/preflight.py	2012-09-28 15:02:24 +0000
+++ src/webcatalog/preflight.py	2013-03-01 19:16:20 +0000
@@ -27,6 +27,7 @@
 import openid
 import piston.utils
 
+import webcatalog
 from webcatalog.utilities import WebServices
 
 __metaclass__ = type
@@ -46,6 +47,7 @@
 
     def versions(self):
         return [
+            {'name': 'webcatalog', 'version': webcatalog.__version__},
             {'name': 'openid', 'version': openid.__version__},
             {'name': 'piston', 'version': piston.utils.get_version()},
         ]

=== modified file 'src/webcatalog/tests/test_preflight.py'
--- src/webcatalog/tests/test_preflight.py	2012-10-17 07:46:31 +0000
+++ src/webcatalog/tests/test_preflight.py	2013-03-01 19:16:20 +0000
@@ -83,6 +83,7 @@
             'Django',
             'Platform',
             'preflight',
+            'webcatalog',
         ])
         expected_checks = set([
             ('validate_config', True),