update setup.py

Author: XiaohaoYang

AUTHORS.txt

@@ -1 +1,7 @@
-Xiaohao Yang
+This code is developed by:
+
+	Xiaohao Yang
+
+This code was developed as part of the xPDFsuite project to create software 
+and tools for general researchers to use PDF in their work. For more 
+information on the DiffPy project email [email protected]

LICENSENOTICE.txt

@@ -5,7 +5,6 @@ prohibited.  If you don’t know whether or not your anticipated use is under
 a license, you must contact Prof. Simon Billinge at [email protected].
 Use of this software without a license is prohibited.
 
-Copyright 2009-2014, Trustees of Columbia University in the City of New York.
-
+Copyright 2009-2016, Trustees of Columbia University in the City of New York.
 
 For more information please email Prof. Simon Billinge at [email protected]

conda-recipe/bld.bat

@@ -9,51 +9,70 @@
 """
 
 import os
-import glob
 from setuptools import setup, find_packages
+from setuptools.command.build_py import build_py
+import py_compile
+
+
+class custom_build_pyc(build_py):
+
+    def byte_compile(self, files):
+        for file in files:
+            if file.endswith('.py'):
+                py_compile.compile(file)
+                os.unlink(file)
+
+# Use this version when git data are not available, like in git zip archive.
+# Update when tagging a new release.
+FALLBACK_VERSION = '1.0'
 
 # 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, 'dpx', 'confutils', 'version.cfg')
+gitarchivecfgfile = versioncfgfile.replace('version.cfg', 'gitarchive.cfg')
+
 
 def gitinfo():
     from subprocess import Popen, PIPE
     kw = dict(stdout=PIPE, cwd=MYDIR)
-    rv = {}
     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()
-    if desc != '':
-        rv['version'] = desc.strip().split('-')[0].lstrip('v')
-    else:
-        rv['version'] = '1.0'
-    if glog != '':
-        rv['commit'], rv['timestamp'], rv['date'] = glog.strip().split(None, 2)
-    else:
-        rv['commit'], rv['timestamp'], rv['date'] = 'no git', 'no git', 'no git'
+    rv = {}
+    rv['version'] = '.post'.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)
+    import re
+    from ConfigParser import RawConfigParser
+    vd0 = dict(version=FALLBACK_VERSION, commit='', date='', timestamp=0)
+    # first fetch data from gitarchivecfgfile, ignore if it is unexpanded
+    g = vd0.copy()
+    cp0 = RawConfigParser(vd0)
+    cp0.read(gitarchivecfgfile)
+    if '$Format:' not in cp0.get('DEFAULT', 'commit'):
+        g = cp0.defaults()
+        mx = re.search(r'\btag: v(\d[^,]*)', g.pop('refnames'))
+        if mx:
+            g['version'] = mx.group(1)
+    # then try to obtain version data from git.
     gitdir = os.path.join(MYDIR, '.git')
-    if not os.path.isdir(gitdir):
-        # not a git repo
-        cp.set('DEFAULT', 'version', '1.0')
-        cp.set('DEFAULT', 'commit', 'no git')
-        cp.set('DEFAULT', 'date', 'no git')
-        cp.set('DEFAULT', 'timestamp', 'no git')
-        cp.write(open(versioncfgfile, 'w'))
-    try:
-        g = gitinfo()
-    except OSError:
-        return cp
+    if os.path.exists(gitdir) or 'GIT_DIR' in os.environ:
+        try:
+            g = gitinfo()
+        except OSError:
+            pass
+    # finally, check and update the active version file
+    cp = RawConfigParser()
+    cp.read(versioncfgfile)
     d = cp.defaults()
-    if g['version'] != d.get('version') or g['commit'] != d.get('commit'):
+    rewrite = not d or (g['commit'] and (
+        g['version'] != d.get('version') or g['commit'] != d.get('commit')))
+    if rewrite:
         cp.set('DEFAULT', 'version', g['version'])
         cp.set('DEFAULT', 'commit', g['commit'])
         cp.set('DEFAULT', 'date', g['date'])
@@ -63,27 +82,36 @@ def getversioncfg():
 
 versiondata = getversioncfg()
 
+
+def dirglob(d, *patterns):
+    from glob import glob
+    rv = []
+    for p in patterns:
+        rv += glob(os.path.join(d, p))
+    return rv
+
 # define distribution
 setup_args = dict(
-        name='dpx.confutils',
-        version=versiondata.get('DEFAULT', 'version'),
-        namespace_packages=['dpx'],
-        packages=find_packages(),
-        include_package_data=True,
-        zip_safe=False,
-        entry_points={
-            # define console_scripts here, see setuptools docs for details.
-        },
-        
-        author='Simon J.L. Billinge',
-        author_email='[email protected]',
-        description='configuration utilities for dpx project',
-        maintainer='Xiaohao Yang',
-        maintainer_email='[email protected]',
-        license='see LICENSENOTICE.txt',
-        url='',
-        keywords='dpx configuration utilities',
-        classifiers=[
+    name='dpx.confutils',
+    cmdclass=dict(build_py=custom_build_pyc),
+    version=versiondata.get('DEFAULT', 'version'),
+    namespace_packages=['dpx'],
+    packages=find_packages(),
+    include_package_data=True,
+    zip_safe=False,
+    entry_points={
+        # define console_scripts here, see setuptools docs for details.
+    },
+
+    author='Simon J.L. Billinge',
+    author_email='[email protected]',
+    description='configuration utilities for dpx project',
+    maintainer='Xiaohao Yang',
+    maintainer_email='[email protected]',
+    license='see LICENSENOTICE.txt',
+    url='',
+    keywords='dpx configuration utilities',
+    classifiers=[
             # List of possible values at
             # http://pypi.python.org/pypi?:action=list_classifiers
             'Development Status :: 5 - Production/Stable',
@@ -97,7 +125,7 @@ def getversioncfg():
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             'Topic :: Scientific/Engineering :: Physics',
-        ],
+    ],
 )
 
 if __name__ == '__main__':