From 0ecde665fda5e74a35c7ffc417eebaf12d3a1874 Mon Sep 17 00:00:00 2001
From: pengyuesheng <pengyuesheng@gohighsec.com>
Date: Thu, 1 Aug 2019 17:10:16 +0800
Subject: [PATCH] Sync Sphinx requirement

Sync sphinx dependency with global requirements. It caps python 2 since
sphinx 2.0 no longer supports Python 2.7.

Change-Id: I2dc7c29d0e0392f7a8c31e83ed2383863a13cf4d
---
 requirements.txt      | 2 +-
 test-requirements.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index aa5b296d..8553b8bc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ croniter>=0.3.4 # MIT License
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 greenlet>=0.4.10 # MIT
 icalendar>=3.10 # BSD
-jsonschema<3.0.0,>=2.6.0 # MIT
+jsonschema>=2.6.0 # MIT
 keystoneauth1>=3.4.0 # Apache-2.0
 keystonemiddleware>=4.18.0 # Apache-2.0
 kubernetes>=5.0.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f7160a60..f2d4652c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,8 @@ botocore>=1.5.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 croniter>=0.3.4 # MIT License
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
 oslotest>=3.2.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 taskflow>=2.16.0 # Apache-2.0