Added --version option to mkexp, fixed descriptive message for getexp

CHANGES.txt

@@ -12,6 +12,8 @@ Release 1.0.0
 Global
 ------
 
+* Fixed descriptive message for getexp
+* Added --version option to mkexp
 * Changed rmexp to remove empty parent directories
 * Changed rmexp to remove monitoring data
 

getexp

@@ -27,7 +27,7 @@ config_roots = os.environ.get('MKEXP_PATH', '').split(':')
 # Check command line
 
 command_line = argparse.ArgumentParser(description=
-    'Generate an experiment from templates and the given configuration file.')
+    'Print experiment info in shell-digestible form.')
 command_line.add_argument('config', help='experiment configuration file name')
 command_line.add_argument('assigns', metavar='key=value', nargs='*',
                            help='override configuration file settings')

mkexp

@@ -22,6 +22,7 @@ from jinja2 import Environment, ChoiceLoader, FileSystemLoader, \
 from expconfig import ExpConfig, ExpConfigError
 import feedback
 import files
+import package_info
 
 #
 # Basic settings
@@ -252,7 +253,8 @@ config_roots = os.environ.get('MKEXP_PATH', '').split(':')
 # Check command line
 
 command_line = argparse.ArgumentParser(description=
-    'Generate an experiment from templates and the given configuration file.')
+    'Generate an experiment from templates and the given configuration file.',
+    version=package_info.version)
 command_line.add_argument('config', help='experiment configuration file name')
 command_line.add_argument('assigns', metavar='key=value', nargs='*',
                            help='override configuration file settings')

package_info.py

+'''
+Information on package name and version
+'''
+
+full_name = 'Make Experiments!'
+name = 'mkexp'
+version = '1.0.0dev'

setup.py

 from distutils.core import setup
-
-name = 'mkexp'
-version = '1.0.0dev'
+import package_info
 
 setup(
-    name = name,
-    version = version,
+    name = package_info.name,
+    version = package_info.version,
     description = 'Run-script generation for earth system models',
     long_description = open('README.txt').read(),
     author = 'Karl-Hermann Wieners',
     author_email = 'karl-hermann.wieners@mpimet.mpg.de',
     url = 'http://code.mpimet.mpg.de/projects/esmenv',
-    py_modules = ['configobj', 'validate', 'feedback', 'expconfig', 'files'],
+    py_modules = ['configobj', 'validate', 'feedback', 'expconfig', 'files', 'package_info'],
     scripts = ['mkexp', 'getexp', 'rmexp', 'diffexp', 'diffpath', 'cpexp', 'cppath'],
-    data_files = [('share/doc/'+name, ['doc/mkexp.pdf'])],
+    data_files = [('share/doc/'+package_info.name, ['doc/mkexp.pdf'])],
     platforms = ['Posix'],
     license = 'LICENSE.txt',
     requires = ['Jinja2(>= 2.6)']