Merge branch 'dev9'

ENCODE-DCC · Jun 25, 2019 · a302921 · a302921
2 parents 85d6ad9 + dd7e1fb
commit a302921
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/caper/caper_args.py b/caper/caper_args.py
@@ -11,6 +11,9 @@
 import os
 from distutils.util import strtobool
 
+
+__version__ = '0.3.9'
+
 DEFAULT_JAVA_HEAP_SERVER = '5G'
 DEFAULT_JAVA_HEAP_RUN = '1G'
 DEFAULT_CAPER_CONF = '~/.caper/default.conf'
@@ -194,7 +197,12 @@ def parse_caper_arguments():
     conf_parser.add_argument('-c', '--conf', help='Specify config file',
                              metavar='FILE',
                              default=DEFAULT_CAPER_CONF)
+    conf_parser.add_argument('-v', '--version', action='store_true',
+                             help='Show version')
     known_args, remaining_argv = conf_parser.parse_known_args()
+    if known_args.version is not None and known_args.version:
+        print(__version__)
+        sys.exit(0)
 
     # read conf file if it exists
     defaults = {}

diff --git a/setup.py b/setup.py
@@ -1,11 +1,12 @@
 import setuptools
+from caper import caper_args
 
 with open('README.md', 'r') as fh:
     long_description = fh.read()
 
 setuptools.setup(
     name='caper',
-    version='v0.3.8',
+    version=caper_args.__version__,
     python_requires='>3.4.1',
     scripts=['bin/caper', 'mysql/run_mysql_server_docker.sh',
              'mysql/run_mysql_server_singularity.sh'],