Merge branch 'master' of https://github.com/scopatz/xonsh

docs/conf.py

@@ -10,6 +10,7 @@
 
 import sys, os
 import cloud_sptheme as csp
+from xonsh import __version__ as XONSH_VERSION
 
 # -- General configuration -----------------------------------------------------
 
@@ -42,10 +43,10 @@ copyright = u'2015, Anthony Scopatz'
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = XONSH_VERSION.rsplit('.',1)[0]
 
 # The full version, including alpha/beta/rc tags.
-release = '0.1.3'
+release = XONSH_VERSION
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -15,7 +15,7 @@ except ImportError:
     from distutils.command.install import install as install
     HAVE_SETUPTOOLS = False
 
-VERSION = '0.1.3'
+from xonsh import __version__ as XONSH_VERSION
 
 TABLES = ['xonsh/lexer_table.py', 'xonsh/parser_table.py']
 
@@ -59,7 +59,7 @@ def main():
         description='an exotic, usable shell',
         long_description=readme,
         license='BSD',
-        version=VERSION,
+        version=XONSH_VERSION,
         author='Anthony Scopatz',
         maintainer='Anthony Scopatz',
         author_email='scopatz@gmail.com',

xonsh/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.1.3'

xonsh/environ.py

@@ -9,6 +9,7 @@ import platform
 import subprocess
 from warnings import warn
 
+from xonsh import __version__ as XONSH_VERSION
 from xonsh.tools import TERM_COLORS
 
 def current_branch(cwd=None):
@@ -117,6 +118,7 @@ def multiline_prompt():
 
 
 BASE_ENV = {
+    'XONSH_VERSION': XONSH_VERSION,
     'INDENT': '    ',
     'PROMPT': default_prompt,
     'TITLE': default_title,