From: Niall Douglas (a [underscors] sourceforge {at} nedprod [dot] com) <spam@spamtrap.com>
Date: Fri, 24 Feb 2012 19:35:04 +0000 (-0500)
Subject: Cherrypick a better version string for setup.py from Niall Douglas.
X-Git-Tag: 1.1.0~163
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6c42d0b1be2e22ce09163cd5533db8821455337;p=be.git

Cherrypick a better version string for setup.py from Niall Douglas.

WTK: This is a small part of Niall's

  commit 7f7a7738bcbcfd06a026f2985c1823a4ba5eb55b
  Author: Niall Douglas ...
  Date:   Tue Feb 21 20:35:28 2012 +0000

    Several hacks to make BE compatible with bbfreeze and therefore
    compilable into a self contained directory

I cleaned up his string construction, which was originally

  version.version()+" ("+rev_date+")"
---

diff --git a/setup.py b/setup.py
index b7fb839..bd45d08 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 import os.path
 
-from libbe import _version
+from libbe import _version, version
 
 rev_id = _version.version_info["revision"]
 rev_date = _version.version_info["date"]
@@ -16,7 +16,7 @@ if os.path.exists(man_path):
 
 setup(
     name='Bugs Everywhere',
-    version=rev_date,
+    version='{} ({})'.format(version.version(), rev_date),
     description='Bugtracker supporting distributed revision control',
     url='http://bugseverywhere.org/',
     packages=['libbe',