Merge lp:~cjohnston/summit/963312 into lp:summit

[Chris Johnston]

Changes the way Summit parses version info

Changes the way Summit parses version info

[Adnane Belmadiaf (daker)]

+1 from me

review: Approve

=== modified file 'summit/common/context_processors.py'
--- summit/common/context_processors.py	2012-04-17 01:53:48 +0000
+++ summit/common/context_processors.py	2012-12-15 02:10:24 +0000
@@ -22,6 +22,7 @@
 from django.conf import settings
 
 from common.models import Menu
+import version
 
 
 def url_base(request):
@@ -41,9 +42,8 @@
     """
     add The Summit Scheduler version to template context processor.
     """
+    return {'summit_version': version.version, 'summit_revno': version.revno}
 
-    version = getattr(settings, 'VERSION_STRING', 'unknown')
-    return {'summit_version': version}
 
 def site_menu(request):
     """

=== modified file 'summit/common/management/commands/release.py'
--- summit/common/management/commands/release.py	2012-01-23 01:18:55 +0000
+++ summit/common/management/commands/release.py	2012-12-15 02:10:24 +0000
@@ -15,12 +15,12 @@
     except:
         bzr_revno = 'unknown'
 
-    file_name = os.path.join(settings.PROJECT_PATH, "version")
+    file_name = os.path.join(settings.PROJECT_PATH, "version.py")
     if os.path.exists(file_name):
         os.remove(file_name)
     f = open(file_name, "w")
-    f.write("""version: %s
-revno: %s
+    f.write("""version = '%s'
+revno = '%s'
 """ % (version, bzr_revno))
     f.close()
     return (version, bzr_revno)

=== modified file 'summit/common/templates/base.html'
--- summit/common/templates/base.html	2012-10-10 16:02:28 +0000
+++ summit/common/templates/base.html	2012-12-15 02:10:24 +0000
@@ -103,7 +103,7 @@
         <p>&copy;  Canonical Ltd., Ubuntu Community.</p>
         <p>Ubuntu and Canonical are registered trademarks of <a href="http://www.canonical.com">Canonical Ltd</a>.</p>
         <p>Problems with Summit? <a href="https://bugs.launchpad.net/summit/+filebug">File a Bug &rsaquo;</a></p>
-        <p>Summit {{ summit_version }}</p>
+        <p>The Summit Scheduler version {{ summit_version }} (revno: {{ summit_revno }})</p>
     </div>
 {% endblock %}
 

=== modified file 'summit/common/utils.py'
--- summit/common/utils.py	2012-08-12 22:32:46 +0000
+++ summit/common/utils.py	2012-12-15 02:10:24 +0000
@@ -10,26 +10,3 @@
         from shortcuts import redirect as red
 
     return red(to, *args, **kwargs)
-
-
-def get_summit_version(version_file, debug):
-    """
-    return the bzr revision number and version of The Summit Scheduler
-    """
-
-    if not os.path.exists(version_file):
-        return "version unknown"
-
-    f = email.message_from_file(open(version_file))
-    version = f["version"]
-    bzr_revno = f["revno"]
-    
-    if debug:
-        try:
-            from bzrlib.branch import Branch
-            branch = Branch.open_containing('.')[0]
-            bzr_revno = branch.revno()
-        except:
-            pass
-
-    return "version %s (rev %s)" % (version, bzr_revno)

=== modified file 'summit/settings.py'
--- summit/settings.py	2012-10-09 20:42:22 +0000
+++ summit/settings.py	2012-12-15 02:10:24 +0000
@@ -30,11 +30,6 @@
 OPENID_FOLLOW_RENAMES=True
 OPENID_SREG_REQUIRED_FIELDS = ['email']
 
-from common import utils
-VERSION_STRING = utils.get_summit_version(
-                        os.path.join(PROJECT_PATH, "version"),
-                        DEBUG)
-
 SITE_ROOT = 'http://summit.ubuntu.com'
 
 ADMINS = (

=== removed file 'summit/version'
--- summit/version	2012-10-25 15:16:15 +0000
+++ summit/version	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-version: 1.2.5
-revno: 465

=== added file 'summit/version.py'
--- summit/version.py	1970-01-01 00:00:00 +0000
+++ summit/version.py	2012-12-15 02:10:24 +0000
@@ -0,0 +1,2 @@
+version = '1.2.5'
+revno = '465'