Convert to git-based versioning.

Derive version number from the nearest git tag.
Provide access to the related commit date and SHA checksum.
Allow setup.py to be importable if sphinx/docutils need to
determine package version.

Author: pavoljuhas

Diff for: diffpy/srmise/version.py

@@ -11,15 +11,20 @@
 #
 ##############################################################################
 
-"""Definition of __version__ and __date__ for SrMise.
+"""Definition of __version__, __date__, __gitsha__.
 """
 
-# obtain version information
-from pkg_resources import get_distribution
-__version__ = get_distribution('diffpy.srmise').version
+from pkg_resources import resource_stream
+from ConfigParser import SafeConfigParser
 
-# we assume that tag_date was used and __version__ ends in YYYYMMDD
-__date__ = __version__[-8:-4] + '-' + \
-           __version__[-4:-2] + '-' + __version__[-2:]
+# obtain version information from the version.cfg file
+cp = SafeConfigParser()
+cp.readfp(resource_stream(__name__, 'version.cfg'))
+
+__version__ = cp.get('DEFAULT', 'version')
+__date__ = cp.get('DEFAULT', 'date')
+__gitsha__ = cp.get('DEFAULT', 'commit')
+
+del cp
 
 # End of file

Diff for: setup.py

@@ -1,9 +1,58 @@
 #!/usr/bin/env python
 
+# Installation script for diffpy.srmise
+
+"""diffpy.srmise - identify peaks and peak shoulders in PDF curve
+
+Packages:   diffpy.srmise
+"""
+
+import os
 from setuptools import setup, find_packages
-setup(
+
+# versioncfgfile holds version data for git commit hash and date.
+# It must reside in the same directory as version.py.
+MYDIR = os.path.dirname(os.path.abspath(__file__))
+versioncfgfile = os.path.join(MYDIR, 'diffpy/srmise/version.cfg')
+
+def gitinfo():
+    from subprocess import Popen, PIPE
+    kw = dict(stdout=PIPE, cwd=MYDIR)
+    proc = Popen(['git', 'describe', '--match=v[[:digit:]]*'], **kw)
+    desc = proc.stdout.read()
+    proc = Popen(['git', 'log', '-1', '--format=%H %at %ai'], **kw)
+    glog = proc.stdout.read()
+    rv = {}
+    rv['version'] = '-'.join(desc.strip().split('-')[:2]).lstrip('v')
+    rv['commit'], rv['timestamp'], rv['date'] = glog.strip().split(None, 2)
+    return rv
+
+
+def getversioncfg():
+    from ConfigParser import SafeConfigParser
+    cp = SafeConfigParser()
+    cp.read(versioncfgfile)
+    gitdir = os.path.join(MYDIR, '.git')
+    if not os.path.isdir(gitdir):  return cp
+    try:
+        g = gitinfo()
+    except OSError:
+        return cp
+    d = cp.defaults()
+    if g['version'] != d.get('version') or g['commit'] != d.get('commit'):
+        cp.set('DEFAULT', 'version', g['version'])
+        cp.set('DEFAULT', 'commit', g['commit'])
+        cp.set('DEFAULT', 'date', g['date'])
+        cp.set('DEFAULT', 'timestamp', g['timestamp'])
+        cp.write(open(versioncfgfile, 'w'))
+    return cp
+
+versiondata = getversioncfg()
+
+# define distribution, but make this module importable
+setup_args = dict(
     name = "diffpy.srmise",
-    version = "0.4a1",
+    version = versiondata.get('DEFAULT', 'version'),
     namespace_packages = ['diffpy'],
     packages = find_packages(),
     include_package_data = True,
@@ -23,4 +72,31 @@
             'srmiseplot = diffpy.srmise.applications.plot:main',
             ]
     },
+
+    author = "Luke Granlund",
+    author_email = "[email protected]",
+    description = "SrMise - FIXME",
+    license = 'FIXME',
+    # url = "",
+    # keywords = "",
+    classifiers = [
+        # List of possible values at
+        # http://pypi.python.org/pypi?:action=list_classifiers
+        'Development Status :: 3 - Alpha',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Education',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: MacOS',
+        'Operating System :: POSIX',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Scientific/Engineering :: Chemistry',
+        'Topic :: Scientific/Engineering :: Physics',
+        'Topic :: Software Development :: Libraries',
+    ],
 )
+
+if __name__ == '__main__':
+    setup(**setup_args)