Only store version string in one place

crobinso · crobinso · commit bdcdf7fa5da2 · 2012-12-27T13:52:04.000-05:00
This requires a bit of a hack for setup.py, but it should be safe.
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -25,7 +25,6 @@ import xmlrpclib
 import bugzilla
 import bugzilla.util
 
-version = '0.7.0'
 default_bz = 'https://bugzilla.redhat.com/xmlrpc.cgi'
 
 _is_unittest = bool(os.getenv("__BUGZILLA_UNITTEST"))
@@ -80,7 +79,7 @@ def open_without_clobber(name, *args):
 def setup_parser():
     u = ("%%prog [global options] COMMAND [command-options]"
          "\nCommands: %s" % ','.join(cmdlist))
-    p = optparse.OptionParser(usage=u, version=version)
+    p = optparse.OptionParser(usage=u, version=bugzilla.__version__)
     p.disable_interspersed_args()
     p.epilog = 'Try "bugzilla COMMAND --help" for command-specific help.'
 
@@ -358,7 +357,7 @@ by Bugzilla.
 .I \\fR * attach - attach files to existing bugs, or get attachments
 .br
 .I \\fR * info - get info about the given bugzilla instance
-''' % (datestr, version)
+''' % (datestr, bugzilla.__version__)
 
     manformatter = ManHelpFormatter()
     parser = setup_parser()
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -9,22 +9,25 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
+__version__ = "0.7.0"
+version = __version__
+
 import logging
 import xmlrpclib
 
-from bugzilla.base import version
 from bugzilla.bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla36
 from bugzilla.bugzilla4 import Bugzilla4
 from bugzilla.nvlbugzilla import NovellBugzilla
 from bugzilla.rhbugzilla import RHBugzilla, RHBugzilla3, RHBugzilla4
 
-log = logging.getLogger("bugzilla")
-
 # advertised class list
 classlist = ['Bugzilla3', 'Bugzilla32', 'Bugzilla34',
              'Bugzilla36', 'Bugzilla4', 'RHBugzilla3', 'RHBugzilla4',
              'NovellBugzilla']
 
+log = logging.getLogger("bugzilla")
+
+
 
 def getBugzillaClassForURL(url):
     log.debug("Choosing subclass for %s" % url)
@@ -76,7 +79,7 @@ class Bugzilla(object):
     to use and uses that. Requires 'url' parameter so we can check available
     XMLRPC methods to determine the Bugzilla version.'''
     def __init__(self, **kwargs):
-        log.info("Bugzilla v%s initializing" % version)
+        log.info("Bugzilla v%s initializing" % __version__)
         if 'url' not in kwargs:
             raise TypeError("You must pass a valid bugzilla xmlrpc.cgi URL")
 
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -18,11 +18,12 @@
 import urllib2
 import xmlrpclib
 
+from bugzilla import __version__
+
 log = logging.getLogger('bugzilla')
 
-version = '0.7.0'
 user_agent = ('Python-urllib2/%s bugzilla.py/%s' %
-              (urllib2.__version__, version))
+              (urllib2.__version__, __version__))
 
 
 class BugzillaError(Exception):
diff --git a/setup.py b/setup.py
@@ -5,10 +5,13 @@
 
 from distutils.core import setup, Command
 
-# XXX: importing this here means any external requirements are
-# required at RPM build time. Should store canonical version in its
-# own file
-import bugzilla.base
+
+def get_version():
+    f = open("bugzilla/__init__.py")
+    for line in f:
+        if line.startswith('__version__'):
+            return eval(line.split('=')[-1])
+
 
 class TestCommand(Command):
     user_options = [
@@ -38,13 +41,6 @@ def run(self):
         cov.erase()
         cov.start()
 
-        # Reload the library so we get accurate coverage data
-        for name in dir(bugzilla):
-            attr = getattr(bugzilla, name)
-            if type(attr) is type(bugzilla):
-                reload(attr)
-        reload(bugzilla)
-
         testfiles = []
         for t in glob.glob(os.path.join(os.getcwd(), 'tests', '*.py')):
             if t.endswith("__init__.py"):
@@ -135,7 +131,7 @@ def run(self):
 
 
 setup(name='python-bugzilla',
-      version=str(bugzilla.base.version),
+      version=get_version(),
       description='Bugzilla XMLRPC access module',
       author='Will Woods',
       author_email='wwoods@redhat.com',
