diff --git a/doc/conf.py b/doc/conf.py index ce93c59ac24..92b338fe4d2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -9,6 +9,8 @@ sys.path.extend([ os.path.join(docs_basepath, '_ext'), # Sphinx extensions ]) +from salt import __version__ + # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. @@ -39,9 +41,9 @@ copyright = u'2011, Thomas S. Hatch' # built documents. # # The short X.Y version. -version = '0.9.2' +version = __version__ # The full version, including alpha/beta/rc tags. -release = '0.9.2' +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/index.rst b/doc/index.rst index 2cf56708943..ab22a744578 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -29,7 +29,7 @@ Release announcement: Download -------- -The latest Salt is 0.9.2: +The latest Salt is |version|: https://github.com/downloads/thatch45/salt/salt-0.9.2.tar.gz diff --git a/salt/__init__.py b/salt/__init__.py index 02c6d66d546..10de66cdb91 100755 --- a/salt/__init__.py +++ b/salt/__init__.py @@ -1,6 +1,9 @@ ''' Make me some salt! ''' +__version_info__ = (0, 9, 2) +__version__ = '.'.join(map(str, __version_info__)) + # Import python libs import optparse import os diff --git a/setup.py b/setup.py index d2a5c86d950..7955561a053 100755 --- a/setup.py +++ b/setup.py @@ -11,8 +11,10 @@ from distutils.extension import Extension from distutils.sysconfig import get_python_lib, PREFIX from Cython.Distutils import build_ext +from salt import __version__ + NAME = 'salt' -VER = '0.9.2' +VER = __version__ DESC = 'Portable, distrubuted, remote execution and configuration management system' mod_path = os.path.join(get_python_lib(), 'salt/modules/')