Merge "switch from oslosphinx to openstackdocstheme"1.24.1

3 files changed, 17 insertions, 4 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index e68034d..5797d62 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,10 +23,16 @@ sys.path.insert(0, os.path.abspath('../..'))
 extensions = [
     'sphinx.ext.autodoc',
     #'sphinx.ext.intersphinx',
-    'oslosphinx',
+    'openstackdocstheme',
     'oslo_config.sphinxext',
 ]
 
+# openstackdocstheme options
+repository_name = 'openstack/oslo.policy'
+bug_project = 'oslo.policy'
+bug_tag = ''
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
+
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
 # execute "export SPHINX_DEBUG=1" in your terminal to disable
@@ -65,6 +71,7 @@ modindex_common_prefix = ['oslo_policy.']
 # html_theme_path = ["."]
 # html_theme = '_theme'
 # html_static_path = ['static']
+html_theme = 'openstackdocs'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index e6052a4..709ae44 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -35,10 +35,16 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'oslosphinx',
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
+# openstackdocstheme options
+repository_name = 'openstack/oslo.policy'
+bug_project = 'oslo.policy'
+bug_tag = ''
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -109,7 +115,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'openstackdocs'
 
 # 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
diff --git a/test-requirements.txt b/test-requirements.txt
index 075c7d1..8fb07b1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,7 @@ requests-mock>=1.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 
 # These are needed for docs generation
-oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.11.0 # Apache-2.0
 sphinx>=1.6.2 # BSD
 
 reno!=2.3.1,>=1.8.0 # Apache-2.0