Merge "Switch to newer openstackdocstheme and reno versions"

doc/requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 sphinx>=2.0.0,!=2.1.0 # BSD
-openstackdocstheme>=2.0.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 
 # releasenotes
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0

doc/source/conf.py

@@ -47,7 +47,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -57,7 +57,8 @@ pygments_style = 'sphinx'
 # html_theme = '_theme'
 # html_static_path = ['static']
 html_theme = 'openstackdocs'
-repository_name ='openstack/masakari-monitors'
+openstackdocs_repo_name ='openstack/masakari-monitors'
+openstackdocs_bug_project = 'masakari-monitors'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project

lower-constraints.txt

@@ -43,7 +43,6 @@ munch==2.2.0
 netaddr==0.7.19
 netifaces==0.10.6
 lxml==3.4.1
-openstackdocstheme==2.0.0
 openstacksdk==0.13.0
 os-client-config==1.29.0
 os-service-types==1.2.0
@@ -82,7 +81,6 @@ python-novaclient==10.1.0
 python-subunit==1.0.0
 pytz==2018.3
 PyYAML==3.12
-reno==2.5.0
 repoze.lru==0.7
 requests==2.18.4
 requestsexceptions==1.4.0
@@ -90,8 +88,6 @@ rfc3986==1.1.0
 Routes==2.4.1
 simplejson==3.13.2
 snowballstemmer==1.2.1
-Sphinx==2.0.0
-sphinxcontrib-websupport==1.0.1
 statsd==3.2.2
 stestr==2.0.0
 stevedore==1.28.0

releasenotes/source/conf.py

@@ -98,7 +98,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -112,7 +112,9 @@ pygments_style = 'sphinx'
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 html_theme = 'openstackdocs'
-repository_name = 'openstack/masakari-monitors'
+openstackdocs_repo_name = 'openstack/masakari-monitors'
+openstackdocs_bug_project = 'masakari-monitors'
+openstackdocs_auto_name = False
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

test-requirements.txt

@@ -6,13 +6,9 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx>=2.0.0,!=2.1.0 # BSD
-openstackdocstheme>=2.0.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 os-testr>=1.0.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 ddt>=1.0.1 # MIT
-# releasenotes
-reno>=2.5.0 # Apache-2.0