openstack/neutron
Code Issues Proposed changes

Automatically determine Quantum version from source

Browse Source 
* Fixes LP1007132
* Adds keystone link
* removes __init__.py since doc/source is not a python module

Change-Id: I6a3234fa760ca23889e352735669547ad9afedf8
This commit is contained in:
Jason Kölker 2012-05-31 16:00:13 -05:00
parent 93ee2838a2
commit 6d14917e76
3 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/__init__.py
View File

@ -1,13 +0,0 @@
# Copyright (C) 2011 OpenStack LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

13
doc/source/__init__.py
View File

@ -1,13 +0,0 @@
# Copyright (C) 2011 OpenStack LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

14
doc/source/conf.py
View File

@ -33,10 +33,9 @@ import sys
# If extensions (or modules to document with autodoc) are in another directory, # 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 # 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. # documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.append([os.path.abspath('../quantum'), BASE_DIR = os.path.dirname(os.path.abspath(__file__))
os.path.abspath('..'), QUANTUM_DIR = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
os.path.abspath('../bin') sys.path.insert(0, QUANTUM_DIR)
])
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
@ -77,10 +76,10 @@ copyright = u'2011-present, OpenStack, LLC.'
# built documents. # built documents.
# #
# Version info # Version info
# TODO(salvatore-orlando): replace here once Bug #826563 is fixed from quantum import version as quantum_version
release = '2012.1' release = quantum_version.version_string()
# The short X.Y version. # The short X.Y version.
version = '2012.1' version = quantum_version.canonical_version_string()
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
@ -246,4 +245,5 @@ intersphinx_mapping = {'python': ('http://docs.python.org/', None),
'swift': ('http://swift.openstack.org', None), 'swift': ('http://swift.openstack.org', None),
'glance': ('http://glance.openstack.org', None), 'glance': ('http://glance.openstack.org', None),
'horizon': ('http://horizon.openstack.org', None), 'horizon': ('http://horizon.openstack.org', None),
'keystone': ('http://keystone.openstack.org', None),
} }