Merge "Switch to newer openstackdocstheme and reno versions"

api-ref/source/conf.py

@@ -37,9 +37,9 @@ extensions = [
     'openstackdocstheme'
 ]
 
-repository_name = 'openstack/ironic'
-use_storyboard = True
-
+openstackdocs_repo_name = 'openstack/ironic'
+openstackdocs_use_storyboard = True
+openstackdocs_auto_name = False
 
 # 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

doc/requirements.txt

@@ -1,7 +1,7 @@
-openstackdocstheme>=1.31.2 # Apache-2.0
+openstackdocstheme>=2.2.0 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
+reno>=3.1.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
 sphinxcontrib-pecanwsme>=0.10.0 # Apache-2.0
 sphinxcontrib-seqdiag>=0.8.4 # BSD

doc/source/conf.py

@@ -59,9 +59,10 @@ apidoc_excluded_paths = [
 ]
 apidoc_separate_modules = True
 
-repository_name = 'openstack/ironic'
-use_storyboard = True
-openstack_projects = [
+openstackdocs_repo_name = 'openstack/ironic'
+openstackdocs_use_storyboard = True
+openstackdocs_pdf_link = True
+openstackdocs_projects = [
     'bifrost',
     'cinder',
     'glance',

releasenotes/source/conf.py

@@ -47,10 +47,9 @@ try:
 except ImportError:
     openstackdocstheme = None
 
-repository_name = 'openstack/ironic'
-bug_project = 'ironic'
-bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+openstackdocs_repo_name = 'openstack/ironic'
+openstackdocs_use_storyboard = True
+openstackdocs_auto_name = False
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']