fixes #32

BCDA-APS · Dec 11, 2017 · e7e517b · e7e517b
1 parent 40bd12f
commit e7e517b
Show file tree

Hide file tree

Showing 8 changed files with 2,351 additions and 48 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+src/pvWebMonitor/_version.py export-subst
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,7 @@
 CHANGES
 =======
 
+:2017.1211.1:        use Python versioneer
 :2017.1211.0:        ``as_string`` attribute
 :2016.1025.0:        revise the versioning process
 :2016.1003.2:        `issue #22 <https://github.com/prjemian/pvWebMonitor/issues/22>`_: correct version number shown now

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,4 @@
 include README.rst
 include CHANGES.rst
+include versioneer.py
+include src/pvWebMonitor/_version.py
diff --git a/setup.cfg b/setup.cfg
@@ -3,3 +3,11 @@ description-file = README.rst
 
 [bdist_wheel]
 universal=1
+
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = src/pvWebMonitor/_version.py
+versionfile_build = pvWebMonitor/_version.py
+tag_prefix =
+parentdir_prefix = pvWebMonitor-
diff --git a/setup.py b/setup.py
@@ -8,6 +8,7 @@
 import os
 import re
 import sys
+import versioneer
 
 # pull in some definitions from the package's __init__.py file
 sys.path.insert(0, os.path.join('src', ))
@@ -20,7 +21,8 @@
 
 
 setup (name             = pvWebMonitor.__package_name__,        # pvWebMonitor
-       version          = pvWebMonitor.__version__,
+       version          = versioneer.get_version(),
+       cmdclass         = versioneer.get_cmdclass(),
        license          = pvWebMonitor.__license__,
        description      = pvWebMonitor.__description__,
        long_description = long_description,

diff --git a/src/pvWebMonitor/__init__.py b/src/pvWebMonitor/__init__.py
@@ -4,17 +4,10 @@
 '''
 
 import os
-from _version import git_release
 
 __package_name__        = u'pvWebMonitor'
 __description__         = u'post EPICS PVs to read-only web page'
 __long_description__    = __description__
-
-_path = os.path.dirname(__file__)
-_vfile = os.path.join(_path, 'VERSION')
-__version__ = open(_vfile, 'r').read()
-__release__             = git_release(__package_name__, __version__)
-
 __author__              = u'Pete R. Jemian'
 __email__               = u'[email protected]'
 __institution__         = u"Advanced Photon Source, Argonne National Laboratory"
@@ -48,3 +41,8 @@
 __credits__ += u'\nemail: ' + __email__
 __credits__ += u'\ninstitution: ' + __institution__
 __credits__ += u'\nURL: ' + __url__
+
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions
+__release__             = __version__