From e4c066142af71cc4a35cd772a1596fc95b96d0bd Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Fri, 12 Apr 2019 16:23:09 +0800
Subject: [PATCH] Fix ci

Change-Id: I63c5b10a14085233a44329437930f660c8c26988
---
 doc/source/conf.py | 15 +++++++++++----
 requirements.txt   |  6 +++---
 tox.ini            |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index d3dcd97..dbb6dbc 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -21,9 +21,9 @@ sys.path.insert(0, os.path.abspath('../..'))
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
+    'openstackdocstheme',
     'sphinx.ext.autodoc',
     #'sphinx.ext.intersphinx',
-    'oslosphinx',
     'yasfb',
 ]
 
@@ -64,9 +64,9 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-# html_theme_path = ["."]
-# html_theme = '_theme'
-# html_static_path = ['static']
+html_theme_path = []
+html_theme = "openstackdocs"
+html_static_path = []
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
@@ -83,3 +83,10 @@ latex_documents = [
 
 # Example configuration for intersphinx: refer to the Python standard library.
 #intersphinx_mapping = {'http://docs.python.org/': None}
+# openstackdocstheme options
+repository_name = 'openstack/puppet-openstack-specs'
+bug_project = 'puppet-openstack-specs'
+bug_tag = ''
+
+# Must set this variable to include year, month, day, hours, and minutes.
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
diff --git a/requirements.txt b/requirements.txt
index 15c4bd5..aae82ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-oslosphinx
-pbr>=0.6,!=0.7,<1.0
-sphinx>=1.1.2,<1.2
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
 stestr>=2.0.0
 testtools>=0.9.34
 yasfb>=0.5.1
diff --git a/tox.ini b/tox.ini
index 9a63b74..82764cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
 [testenv]
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -U {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
 commands = stestr run --slowest {posargs}