Merge pull request #16 from prjemian/versioneer14

Versioneer14, fixes #14

.gitattributes

@@ -0,0 +1 @@
+src/PvMail/_version.py export-subst

MANIFEST.in

@@ -1,2 +1,4 @@
 include README.rst
 include src/PvMail/resources/*
+include versioneer.py
+include src/PvMail/_version.py

README.rst

@@ -10,7 +10,27 @@ Watches an EPICS PV and sends email when value changes from 0 to 1.
 :docs:      http://PvMail.readthedocs.io
 :git:       https://github.com/prjemian/pvMail
 :PyPI:      https://pypi.python.org/pypi/PvMail
-:discussion:
-    .. image:: https://badges.gitter.im/PvMail/Lobby.svg
-       :alt: Join the chat at https://gitter.im/PvMail/Lobby
-       :target: https://gitter.im/PvMail/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
+.. * **build badges**:
+   .. image:: https://travis-ci.org/prjemian/PvMail.svg?branch=master
+      :target: https://travis-ci.org/prjemian/PvMail
+   .. image:: https://coveralls.io/repos/github/prjemian/PvMail/badge.svg?branch=master
+      :target: https://coveralls.io/github/prjemian/PvMail?branch=master
+
+* **release badges**:
+   .. image:: https://img.shields.io/github/tag/prjemian/PvMail.svg
+      :target: https://github.com/prjemian/PvMail/tags
+   .. image:: https://img.shields.io/github/release/prjemian/PvMail.svg
+      :target: https://github.com/prjemian/PvMail/releases
+   .. image:: https://img.shields.io/pypi/v/PvMail.svg
+      :target: https://pypi.python.org/pypi/PvMail/
+   .. image:: https://anaconda.org/prjemian/PvMail/badges/version.svg
+      :target: https://anaconda.org/prjemian/PvMail
+
+
+* **community badges**
+   .. image:: http://depsy.org/api/package/pypi/PvMail/badge.svg
+      :target: http://depsy.org/package/python/PvMail
+   .. image:: https://badges.gitter.im/PvMail/Lobby.svg
+      :alt: Join the chat at https://gitter.im/PvMail/Lobby
+      :target: https://gitter.im/PvMail/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge

docs/source/cli.rst → docs/source/command_line.rst

@@ -146,7 +146,7 @@ or the 32-bit version::
 	/APSshare/epd/rh5-x86/bin/pvMail -h
 
 ..	note::
-	Support for both RHEL5 and RHEL6 use the same Enthought Python Distribution.
+	Support at APS for both RHEL5 and RHEL6 use the same Enthought Python Distribution.
 
 
 

docs/source/conf.py

@@ -55,11 +55,12 @@
 # built documents.
 #
 # The short X.Y version.
-version = PvMail.__version__
-# The full version, including alpha/beta/rc tags.
-# release = "%s (%s)" % (version, PvMail.__full_version__)
-# release = "(%s)" % PvMail.__version__
-release = version
+versioneer_version = PvMail.__version__.split('+')
+version = versioneer_version[0]
+if len(versioneer_version) == 2:
+    release = versioneer_version[1]
+else:
+    release = ''  
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/contents.rst

@@ -6,7 +6,7 @@ Contents
    :maxdepth: 4
 
    overview
-   cli
+   command_line
    gui
    test_database
    pvMail/modules

docs/source/index.rst

@@ -1,5 +1,15 @@
-.. include:: ../../README.rst
+PvMail
+######
 
+Watches an EPICS PV and sends email when value changes from 0 to 1.  
+
+:author:    Pete R. Jemian
+:email:     [email protected]
+:copyright: 2009-2017, UChicago Argonne, LLC
+:license:   ANL OPEN SOURCE LICENSE (see *LICENSE*)
+:docs:      http://PvMail.readthedocs.io
+:git:       https://github.com/prjemian/pvMail
+:PyPI:      https://pypi.python.org/pypi/PvMail
 :version:   |version|
 :release:   |release|
 :published: |today|

docs/source/pvMail/cli.rst

@@ -0,0 +1,10 @@
+
+:mod:`cli` Module
+=================
+
+Source code documentation for EPICS :mod:`cli`
+
+.. automodule:: PvMail.cli
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/pvMail/modules.rst

@@ -35,7 +35,7 @@ PvMail source code documentation
 .. toctree::
    :maxdepth: 4
 
-   pvMail
+   cli
    uic_gui
    ini_config
    mailer

setup.cfg

@@ -3,3 +3,18 @@ description-file = README.rst
 
 [bdist_wheel]
 universal=1
+
+[egg_info]
+tag_build = 
+tag_date = false
+
+[aliases]
+release = egg_info -RDb ''
+
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = src/PvMail/_version.py
+versionfile_build = PvMail/_version.py
+tag_prefix =
+parentdir_prefix = PvMail-

setup.py

@@ -5,14 +5,16 @@
 from setuptools import setup, find_packages
 import os
 import sys
+import versioneer
 
 # make sure our development source is found FIRST!
 sys.path.insert(0, os.path.abspath('./src'))
 import PvMail
 
 setup(
     name             = 'PvMail',
-    version          = PvMail.__version__,
+    version          = versioneer.get_version(),
+    cmdclass         = versioneer.get_cmdclass(),
     author           = PvMail.__author__,
     author_email     = PvMail.__author_email__,
     url              = PvMail.__url__,
@@ -24,14 +26,17 @@
     platforms        = 'any',
     install_requires = PvMail.__install_requires__,
     packages         = ['PvMail',],
-    package_dir      = {'PvMail': 'src/PvMail',},
-    package_data     = {'PvMail': [
-                                    'test.db', 
-                                    'resources/*',
-                                    'LICENSE', 
-                                    'VERSION', 
-                                   ],
-                        },
+    package_dir      = {
+        'PvMail': 'src/PvMail',
+    },
+    package_data     = {
+        'PvMail': [
+            'test.db', 
+            'resources/*',
+            'LICENSE', 
+            'VERSION', 
+           ],
+    },
     entry_points     = {
         # create & install console_scripts in <python>/bin
         'console_scripts': PvMail.__console_scripts__,

src/PvMail/__init__.py

@@ -1,22 +1,4 @@
 import os
-from ._version import git_release
-
-
-VERSION_FILE = 'VERSION'
-
-
-def get_pkg_file_path(fname):
-    '''return the absolute path to the named file in the package directory'''
-    vpath = os.path.abspath(os.path.dirname(__file__))
-    vfile = os.path.join(vpath, fname)
-    if os.path.exists(vfile):
-        RuntimeError('file does not exist: ' + vfile)
-    return vfile
-
-
-def read_resource_file(fname):
-    '''return contents of the named file in the package directory'''
-    return open(get_pkg_file_path(fname)).read()
 
 
 __classifiers__ = [
@@ -37,8 +19,6 @@ def read_resource_file(fname):
 
 __project_name__ = "PvMail"
 __description__ = "Watch an EPICS PV. Send email when it changes from 0 to 1."
-__version__ = read_resource_file(VERSION_FILE).strip()
-__release__ = git_release(__project_name__, __version__)
 __author__ = "Pete Jemian"
 __full_author_list__ = ["Pete Jemian", "Kurt Goetze"]
 __institution__ = "Advanced Photon Source, Argonne National Laboratory"
@@ -49,7 +29,12 @@ def read_resource_file(fname):
 
 # create & install console_scripts in <python>/bin
 __console_scripts__ = [
-                       'pvMail = PvMail.pvMail:main', 
-                       'pvMail_mail_test = PvMail.mailer:main', 
-                       'pvMail_mail_config_file = PvMail.ini_config:main', 
-                       ]
+    'pvMail = PvMail.cli:main', 
+    'pvMail_mail_test = PvMail.mailer:main', 
+    'pvMail_mail_config_file = PvMail.ini_config:main', 
+]
+
+
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions