Update to latest pbr
This commit moves switches tempest from the d2to1 version of pbr and move to the latest version of pbr. However, there is a bug with build_spinx so it doesn't work with a doc version set so that section is removed from the doc conf.py. Change-Id: I4fe14eb2b2e81132f8fa99936a031176b38c437b
This commit is contained in:
parent
c122f1ef43
commit
271139aa7f
@ -51,17 +51,6 @@ master_doc = 'index'
|
|||||||
project = u'Tempest'
|
project = u'Tempest'
|
||||||
copyright = u'2013, OpenStack QA Team'
|
copyright = u'2013, OpenStack QA Team'
|
||||||
|
|
||||||
# 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.
|
|
||||||
import pbr.version
|
|
||||||
version_info = pbr.version.VersionInfo('tempest')
|
|
||||||
version = version_info.version_string()
|
|
||||||
# The full version, including alpha/beta/rc tags.
|
|
||||||
release = version_info.release_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.
|
||||||
#language = None
|
#language = None
|
||||||
|
13
setup.cfg
13
setup.cfg
@ -17,20 +17,7 @@ classifier =
|
|||||||
Programming Language :: Python :: 2
|
Programming Language :: Python :: 2
|
||||||
Programming Language :: Python :: 2.7
|
Programming Language :: Python :: 2.7
|
||||||
|
|
||||||
[global]
|
|
||||||
setup-hooks =
|
|
||||||
pbr.hooks.setup_hook
|
|
||||||
|
|
||||||
[build_sphinx]
|
[build_sphinx]
|
||||||
all_files = 1
|
all_files = 1
|
||||||
build-dir = doc/build
|
build-dir = doc/build
|
||||||
source-dir = doc/source
|
source-dir = doc/source
|
||||||
|
|
||||||
[nosetests]
|
|
||||||
# NOTE(jkoelker) To run the test suite under nose install the following
|
|
||||||
# coverage http://pypi.python.org/pypi/coverage
|
|
||||||
# openstack-nose https://github.com/openstack-dev/openstack-nose
|
|
||||||
verbosity=2
|
|
||||||
|
|
||||||
[pbr]
|
|
||||||
autodoc_tree_index_modules=true
|
|
||||||
|
5
setup.py
5
setup.py
@ -14,8 +14,9 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['d2to1', 'pbr'],
|
setup_requires=['pbr'],
|
||||||
d2to1=True)
|
pbr=True)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user