Commits

Lars Yencken committed ccbaac9

Changes to setuptools, updating package metadata and licensing.

  • Participants
  • Parent commits 12c330b

Comments (0)

Files changed (3)

 *.orig
 *.deb
 MANIFEST
+*.log
+*.egg-info
+* Copyright (c) 2006-2009, Lars Yencken
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * The names of its contributors may not be used to endorse or promote
+*       products derived from this software without specific prior written
+*       permission.
+*
+* THIS SOFTWARE IS PROVIDED BY Lars Yencken ''AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL Lars Yencken BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  consoleLog
 #  
 #  Created by Lars Yencken on 2008-06-12.
-#  Copyright 2008 Lars Yencken. All rights reserved.
+#  Copyright 2008-2009 Lars Yencken. All rights reserved.
 # 
 
 "Setup script for consoleLog module."
 
 import os
-from distutils.core import setup
+from setuptools import setup
 
 def get_hg_version():
     version = None
     if os.system('which hg >/dev/null 2>&1') == 0:
-        # Have mercurial
-        version = os.popen('hg id -n 2>/dev/null').read().strip()
+        version = os.popen('hg id -i 2>/dev/null').read().strip().rstrip('+')
     return version or 'unknown'
 
 setup(
         name='consoleLog',
-        version='0.1.%s' % get_hg_version(),
+        version='0.2.r%s' % get_hg_version(),
+        description='Console logger with progress bars and color',
+        long_description="""
+        A Hierarchical console logger which allows nested human-readable
+        logging and display, with progress bars and color output.
+        """,
+        author='Lars Yencken',
+        author_email='lljy@csse.unimelb.edu.au',
+        license='BSD',
+        url='http://hg@bitbucket.org/lars512/consolelog/',
         packages=['consoleLog'],
         package_dir={'consoleLog': 'src'}
     )