From 87dbe6ea2e15cca72c6f96cf6ed2e8eb897e1f74 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 2 Jul 2017 19:30:46 +0200 Subject: [PATCH] Use openstackdocstheme Use the new theme for the docs. This needs an update of requirements, I synced all requirements with global requirements list. Change-Id: I50c451501a8c428a174f477b89a2986f93adfcb1 --- doc/source/conf.py | 13 +++++++++++-- requirements.txt | 16 ++++++++-------- setup.py | 2 +- test-requirements.txt | 8 ++++---- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index e0ffe3e..342129b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -22,7 +22,7 @@ sys.path.insert(0, os.path.abspath('../..')) extensions = [ 'sphinx.ext.autodoc', #'sphinx.ext.intersphinx', - 'oslosphinx' + 'openstackdocstheme' ] # autodoc generation is a bit aggressive and a nuisance when doing heavy @@ -37,7 +37,12 @@ master_doc = 'index' # General information about the project. project = u'python-cloudkittyclient' -copyright = u'2013, OpenStack Foundation' +copyright = u'2017, OpenStack Foundation' + +# openstackdocstheme options +repository_name = 'openstack/python-cloudkittyclient' +bug_project = 'cloudkitty' +bug_tag = 'python-cloudkittyclient' # If true, '()' will be appended to :func: etc. cross-reference text. add_function_parentheses = True @@ -56,6 +61,10 @@ pygments_style = 'sphinx' # html_theme_path = ["."] # html_theme = '_theme' # html_static_path = ['static'] +html_theme = 'openstackdocs' + +# Must set this variable to include year, month, day, hours, and minutes. +html_last_updated_fmt = '%Y-%m-%d %H:%M' # Output file base name for HTML help builder. htmlhelp_basename = '%sdoc' % project diff --git a/requirements.txt b/requirements.txt index 0ac9b3a..11095e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 # Apache-2.0 -Babel>=2.3.4 # BSD -python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0 -python-openstackclient>=3.0.0 # Apache-2.0 -stevedore>=1.10.0 # Apache-2.0 -oslo.i18n>=2.1.0 # Apache-2.0 +pbr!=2.1.0,>=2.0.0 # Apache-2.0 +Babel!=2.4.0,>=2.3.4 # BSD +python-keystoneclient>=3.8.0 # Apache-2.0 +python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0 +stevedore>=1.20.0 # Apache-2.0 +oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -oslo.utils>=3.11.0 # Apache-2.0 -PrettyTable<0.8,>=0.7 # BSD +oslo.utils>=3.20.0 # Apache-2.0 +PrettyTable<0.8,>=0.7.1 # BSD diff --git a/setup.py b/setup.py index 782bb21..566d844 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.8'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index a91d7ac..97f8436 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,12 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 +hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 -coverage>=3.6 # Apache-2.0 +coverage!=4.4,>=4.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD -oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +sphinx>=1.6.2 # BSD +openstackdocstheme>=1.11.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD