diff --git a/doc/source/conf.py b/doc/source/conf.py index cf838c0032..e5444ae67a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -51,17 +51,6 @@ master_doc = 'index' project = u'Tempest' 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 # for a list of supported languages. #language = None diff --git a/setup.cfg b/setup.cfg index 653ca40981..23a97ff773 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,20 +17,7 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 -[global] -setup-hooks = - pbr.hooks.setup_hook - [build_sphinx] all_files = 1 build-dir = doc/build 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 diff --git a/setup.py b/setup.py index 59a00909ed..70c2b3f32b 100755 --- a/setup.py +++ b/setup.py @@ -14,8 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools setuptools.setup( - setup_requires=['d2to1', 'pbr'], - d2to1=True) + setup_requires=['pbr'], + pbr=True)