From 8cdfdd14a03e1356cda4fcbdfbcc528bc7f397bd Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Thu, 6 Jan 2011 15:29:38 -0500 Subject: Let documentation get version from nova/version.py as well. --- doc/source/conf.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/source/conf.py b/doc/source/conf.py index 8f1b370cc..61b3749d0 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -60,10 +60,12 @@ copyright = u'2010, United States Government as represented by the Administrator # |version| and |release|, also used in various other places throughout the # built documents. # -# The short X.Y version. -version = '2011.1' +import re +from nova import version as nova_version # The full version, including alpha/beta/rc tags. -release = '2011.1-prerelease' +release = nova_version.string() +# The short X.Y version. +version = re.sub(r'-dev$', '', nova_version.string()) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- cgit From 8b3925e4d4b97dc28bfc903483ec4793fb38fed5 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Fri, 7 Jan 2011 15:17:03 +0100 Subject: Less code generation. --- doc/source/conf.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/source/conf.py b/doc/source/conf.py index 61b3749d0..20e9c88af 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -60,12 +60,11 @@ copyright = u'2010, United States Government as represented by the Administrator # |version| and |release|, also used in various other places throughout the # built documents. # -import re from nova import version as nova_version # The full version, including alpha/beta/rc tags. -release = nova_version.string() +release = nova_version.version() # The short X.Y version. -version = re.sub(r'-dev$', '', nova_version.string()) +version = nova_version.canonical_version() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- cgit From a29bba7e9f57b97085902fa97d17de32da8044cb Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Sat, 8 Jan 2011 00:02:24 +0100 Subject: s/canonical_version/canonical_version_string/g --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/source/conf.py b/doc/source/conf.py index 20e9c88af..368a686c3 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -64,7 +64,7 @@ from nova import version as nova_version # The full version, including alpha/beta/rc tags. release = nova_version.version() # The short X.Y version. -version = nova_version.canonical_version() +version = nova_version.canonical_version_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- cgit