Fix docs so they pull version from _version.py

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 41cf25290bf5fa92a8185140b0d9c329e5492047..4209acc8a4c293495fdf1676e73eafc0a5408ce8 100644 (file)
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -17,6 +17,7 @@ import sys, os
 # 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.
 sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath(os.path.join('..', '..')))
 
 # -- General configuration -----------------------------------------------------
 
@@ -47,10 +48,15 @@ copyright = u'2011, 2012 GNU MediaGoblin contributors'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = '0.3.1'
-# The full version, including alpha/beta/rc tags.
-release = '0.3.1.dev'
+try:
+    from mediagoblin._version import __version__
+    # The short X.Y version.
+    version = '.'.join(__version__.split('.')[0:2])
+    # The full version, including alpha/beta/rc tags.
+    release = __version__
+except ImportError:
+    version = 'unknown'
+    release = 'unknown'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.