diff --git a/doc/source/conf.py b/doc/source/conf.py index eb505b7..870edc6 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -23,7 +23,6 @@ sys.path.insert(0, os.path.abspath('../..')) extensions = [ 'sphinx.ext.autodoc', 'openstackdocstheme', - #'sphinx.ext.intersphinx', ] # autodoc generation is a bit aggressive and a nuisance when doing heavy diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index e9ded67..7fadb07 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -52,7 +52,6 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'magnum_tempest_plugin Release Notes' copyright = u'2017, OpenStack Developers' # openstackdocstheme options @@ -196,17 +195,6 @@ htmlhelp_basename = 'magnum_tempest_pluginReleaseNotesdoc' # -- Options for LaTeX output --------------------------------------------- -latex_elements = { - # The paper size ('letterpaper' or 'a4paper'). - # 'papersize': 'letterpaper', - - # The font size ('10pt', '11pt' or '12pt'). - # 'pointsize': '10pt', - - # Additional stuff for the LaTeX preamble. - # 'preamble': '', -} - # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). diff --git a/requirements.txt b/requirements.txt index 6b299af..b431df7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=2.0 # Apache-2.0 +pbr!=2.1.0,>=2.0.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0 -oslo.config>=3.22.0 # Apache-2.0 -six>=1.9.0 -oslo.log>=3.30.0 # Apache-2.0 +oslo.config>=5.2.0 # Apache-2.0 +six>=1.10.0 # MIT +oslo.log>=3.36.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 056c16c..566d844 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index dc23a99..938edf8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,8 +4,8 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD -openstackdocstheme>=1.11.0 # Apache-2.0 +sphinx>=1.8.0,!=2.1.0 # BSD +openstackdocstheme>=1.20.0 # Apache-2.0 # releasenotes -reno>=1.8.0 # Apache-2.0 +reno>=2.5.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 2a2a64e..01a81e0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.1.1 -envlist = py36,py34,py27,pypy,pep8 +envlist = py36,py34,pypy,pep8 skipsdist = True ignore_basepython_conflict = True @@ -37,7 +37,7 @@ commands = python setup.py build_sphinx [testenv:releasenotes] commands = - sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html + sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html [testenv:debug] commands = oslo_debug_helper {posargs}