Make experimental branch use hgdistver with a cache file for creating version numbers. I thank Ronny for this.

ikanobori · ikanobori · commit 9e0d9dd997d8 · 2010-05-26T21:59:56.000+02:00
diff --git a/bpython/__init__.py b/bpython/__init__.py
@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 
-__version__ = 'dev'
+# __version__ = 'dev'
 
 
 def embed(locals_=None, args=['-i', '-q'], banner=None):
diff --git a/bpython/args.py b/bpython/args.py
@@ -8,7 +8,7 @@
 import code
 from optparse import OptionParser, OptionGroup
 
-from bpython import __version__
+from bpython.meta import version 
 from bpython.config import loadini, Struct, migrate_rc
 
 
@@ -81,7 +81,7 @@ def parse(args, extras=None, ignore_stdin=False):
         os.execv(sys.executable, [sys.executable] + args)
 
     if options.version:
-        print 'bpython version', __version__,
+        print 'bpython version', version,
         print 'on top of Python', sys.version.split()[0]
         print ('(C) 2008-2010 Bob Farrell, Andreas Stuehrk et al. '
                'See AUTHORS for detail.')
diff --git a/hgdistver.py b/hgdistver.py
@@ -0,0 +1,93 @@
+import os
+
+def version_from_cachefile(cachefile=None):
+    if not cachefile:
+        return
+    #replaces 'with open()' from py2.6
+    fd = open(cachefile)
+    fd.readline() # remove the comment
+    version = None
+    try:
+        line = fd.readline()
+        version_string = line.split(' = ')[1].strip()
+        version = version_string[1:-1].decode('string-escape')
+    except: # any error means invalid cachefile
+        pass
+    fd.close()
+    return version
+
+def version_from_hg_id(cachefile=None):
+    """stolen logic from mercurials setup.py as well"""
+    if os.path.isdir('.hg'):
+        import commands
+        l = commands.getoutput('hg id -i -t').strip().split()
+        while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags
+            l.pop()
+        if len(l) > 1: # tag found
+            version = l[-1]
+            if l[0].endswith('+'): # propagate the dirty status to the tag
+                version += '+'
+        elif len(l) == 1: #no tag found
+            cmd = 'hg parents --template "{latesttag}.dev{latesttagdistance}-"'
+            version = commands.getoutput(cmd) + l[0]
+            if version[:4] == 'null':
+                version = '0.0' + version[4:]
+
+        if version.endswith('+'):
+            import time
+            version += time.strftime('%Y%m%d')
+        return version
+
+def _archival_to_version(data):
+    """stolen logic from mercurials setup.py"""
+    if 'tag' in data:
+        return data['tag']
+    elif 'latesttag' in data:
+        return '%(latesttag)s.dev%(latesttagdistance)s-%(node).12s' % data
+    else:
+        return data.get('node', '')[:12]
+
+def _data_from_archival(path):
+    import email
+    data = email.message_from_file(open(str(path)))
+    return dict(data.items())
+
+def version_from_archival(cachefile=None):
+    #XXX: asumes cwd is repo root
+    if os.path.exists('.hg_archival.txt'):
+        data = _data_from_archival('.hg_archival.txt')
+        return _archival_to_version(data)
+
+def version_from_sdist_pkginfo(cachefile=None):
+    if cachefile is None and os.path.exists('PKG-INFO'):
+        data = _data_from_archival('PKG-INFO')
+        version = data.get('Version')
+        if version != 'UNKNOWN':
+            return version
+
+def write_cachefile(path, version):
+    fd = open(path, 'w')
+    try:
+        fd.write('# this file is autogenerated by hgdistver + setup.py\n')
+        fd.write('version = %r' % version)
+    finally:
+        fd.close()
+
+
+methods = [
+    version_from_hg_id,
+    version_from_archival,
+    version_from_cachefile,
+    version_from_sdist_pkginfo,
+]
+
+def get_version(cachefile=None):
+    try:
+        version = None
+        for method in methods:
+            version = method(cachefile=cachefile)
+            if version:
+                return version
+    finally:
+        if cachefile and version:
+            write_cachefile(cachefile, version)
diff --git a/setup.py b/setup.py
@@ -7,6 +7,9 @@
 import platform
 import re
 import sys
+
+from hgdistver import get_version
+
 try:
     from setuptools import setup
     using_setuptools = True
@@ -19,8 +22,6 @@
 except ImportError:
     from distutils.command.build_py import build_py
 
-from bpython import __version__
-
 
 if platform.system() == 'FreeBSD':
     man_dir = 'man'
@@ -29,7 +30,7 @@
 
 setup(
     name="bpython",
-    version = __version__,
+    version = get_version('bpython/meta.py'),
     author = "Bob Farrell, Andreas Stuehrk et al.",
     author_email = "robertanthonyfarrell@gmail.com",
     description = "Fancy Interface to the Python Interpreter",
