PEP-396

docs/conf.py

@@ -15,6 +15,8 @@
 import sys
 import os
 
+import vpoller
+
 # 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
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -55,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.5'
+version = vpoller.__version__
 # The full version, including alpha/beta/rc tags.
-release = '0.3.5'
+release = vpoller.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,17 +1,28 @@
-from setuptools import setup
+import re
+import ast
+
+from setuptools import setup, find_packages
+
+
+_version_re = re.compile(r'__version__\s+=\s+(.*)')
+
+with open('src/vpoller/__init__.py', 'rb') as f:
+    version = str(ast.literal_eval(_version_re.search(
+        f.read().decode('utf-8')).group(1))
+    )
 
 setup(
     name='vpoller',
-    version='0.3.5',
+    version=version,
     description='Distributed VMware vSphere API Proxy',
     long_description=open('README.rst').read(),
     author='Marin Atanasov Nikolov',
     author_email='[email protected]',
     license='BSD',
     url='https://github.com/dnaeon/py-vpoller',
     download_url='https://github.com/dnaeon/py-vpoller/releases',
-    packages=['vpoller', 'vpoller.helpers'],
     package_dir={'': 'src'},
+    packages=find_packages('src'),
     scripts=[
         'src/vpoller-client',
         'src/vpoller-proxy',

src/vpoller-client

@@ -34,6 +34,7 @@ discovering and polling of vSphere Object properties.
 
 import logging
 
+from vpoller import __version__
 from vpoller.client import VPollerClient
 from docopt import docopt
 
@@ -70,7 +71,7 @@ Examples:
 
 """
 
-    args = docopt(usage, version='0.3.5')
+    args = docopt(usage, version=__version__)
 
     level = logging.DEBUG if args['--debug'] else logging.INFO
     logging.basicConfig(

src/vpoller-proxy

@@ -33,6 +33,7 @@ between a pool of ZeroMQ workers.
 import os
 import logging
 
+from vpoller import __version__
 from vpoller.client import VPollerClient
 from vpoller.proxy import VPollerProxyManager
 from docopt import docopt
@@ -98,7 +99,7 @@ Options:
 
 """
 
-    args = docopt(usage, version='0.3.5')
+    args = docopt(usage, version=__version__)
 
     if not os.path.exists(args['--file']):
         raise SystemExit, 'Configuration file %s does not exist'

src/vpoller-worker

@@ -36,6 +36,7 @@ performing the actual polling from a vCenter server.
 import os
 import logging
 
+from vpoller import __version__
 from vpoller.client import VPollerClient
 from vpoller.worker import VPollerWorkerManager
 from docopt import docopt
@@ -110,7 +111,7 @@ Options:
 
 """
 
-    args = docopt(usage, version='0.3.5')
+    args = docopt(usage, version=__version__)
 
     if not os.path.exists(args['--file']):
         raise SystemExit, 'Configuration file %s does not exist' % args['--file']

src/vpoller/__init__.py

@@ -1 +1 @@
-__version__ == '0.3.5'
+__version__ = '0.3.5'