x/anvil
Code Issues Proposed changes

Allow the docs to have a version + update version

Browse Source
This commit is contained in:
Joshua Harlow
2012-04-07 10:02:07 -07:00
parent 9851a55ff0
commit 40371522f7
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/version.py
View File

@@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
DEVSTACK_VERSION = ['2012', '1']
DEVSTACK_VERSION = ['2012', '4']
YEAR, COUNT = DEVSTACK_VERSION
FINAL = False # May never be final ;-)
@@ -28,11 +28,3 @@ def version_string():
return canonical_version_string()
else:
return '%s-dev' % (canonical_version_string(),)
def vcs_version_string():
return 'LOCALBRANCH:LOCALREVISION'
def version_string_with_vcs():
return '%s-%s' % (canonical_version_string(), vcs_version_string())

18
docs/source/conf.py
View File

@@ -1,5 +1,12 @@
import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
# 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('../'))
sys.path.insert(0, os.path.abspath('./'))
# Supress warnings for docs that aren't used yet
#unused_docs = [
#]
@@ -42,8 +49,9 @@ project = u'DEVSTACKpy'
# 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.
#
# The short X.Y version.
from devstack import version as devstack_version
release = nova_version.version_string()
version = nova_version.canonical_version_string()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -74,7 +82,7 @@ exclude_patterns = []
# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False
show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
#pygments_style = 'monokai'
@@ -102,7 +110,7 @@ html_theme_options = {
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
html_title = "DEVSTACKpy"
#html_title = "DEVSTACKpy"
# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = "FubuMVC"
@@ -165,7 +173,7 @@ html_logo = 'img/logo.png'
#html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'DEVSTACKpy-doc'
#htmlhelp_basename = 'DEVSTACKpy-doc'
# -- Options for LaTeX output --------------------------------------------------