Merge pull request #199 from nrejack/simplify_version_number

Simplify version number

docs/conf.py

@@ -14,6 +14,7 @@
 
 import sys
 import os
+from setuptools_scm import get_version
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -61,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.15.2'
+version = get_version(root='..', relative_to=__file__)
 # The full version, including alpha/beta/rc tags.
-release = '0.15.2'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

redi/redi.py

@@ -53,9 +53,7 @@
     -b --bulk-send-blanks       Send blank events in bulk instead of
                                 individually [default:False]
 """
-
 __author__ = "University of Florida CTS-IT Team"
-__version__ = "0.15.0"
 __email__ = "ctsit@ctsi.ufl.edu"
 __status__ = "Development"
 
@@ -90,12 +88,19 @@
 import utils.SimpleConfigParser as SimpleConfigParser
 import utils.GetEmrData as GetEmrData
 from utils.GetEmrData import EmrFileAccessDetails
+from setuptools_scm import get_version
 
 #from memory_profiler import profile
 
+# set the version using setuptools_scm
+# allow for setting the version when redi is imported
+try:
+    __version__ = get_version()
+except:
+    __version__ = get_version(root='..', relative_to=__file__)
+
 # Command line default argument values
 _person_form_events_service = None
-
 translational_table_tree = None
 
 DEFAULT_DATA_DIRECTORY = os.getcwd()
@@ -136,7 +141,6 @@ def main():
     - write the Final ElementTree to EAV
     """
 
-
     # TODO: UPDATE COMMENT HERE
     global _person_form_events_service
 

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name='redi',
-    version='0.15.2',
+    use_scm_version=True,
     author='https://www.ctsi.ufl.edu/research/study-development/informatics-consulting/',
     author_email='ctsit@ctsi.ufl.edu',
     packages=find_packages(exclude=['test']),
@@ -54,5 +54,6 @@
     setup_requires=[
         "nose >= 1.0",
         "nosexcover >= 1.0.10",
+        "setuptools_scm >= 1.10.1"
     ],
 )