Fix version and location of heat doc build

pbr injects version information as part of the build_sphinx command,
so having it here is overkill.

Change-Id: I1f89e068da3e47b94434cb71db87704f9665dea2

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1987f68f468b5ea12d39b9deb739a46b721170ef..9b99377b4cc1e40b82cdacf76ba8de713fa38855 100644 (file)
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -47,16 +47,6 @@ master_doc = 'index'
 project = u'Heat'
 copyright = u'2012,2013 Heat Developers'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-
-from heat import version as heat_version
-# The full version, including alpha/beta/rc tags.
-release = heat_version.version_info.release_string()
-# The short X.Y version
-version = heat_version.version_info.version_string()
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None

diff --git a/setup.cfg b/setup.cfg
index 696e1d2c7d87eef48f7faff74c5479f7f4e34e58..b58f60dfe7335e10b347d0431b07fe4f12faf4d3 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -50,4 +50,9 @@ input_file = heat/locale/heat.pot
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = heat/locale/heat.pot
\ No newline at end of file
+output_file = heat/locale/heat.pot
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source