From 85d2b17c49cd5f7e878b32f8e58217923c6c2aa2 Mon Sep 17 00:00:00 2001
From: Minmin Ren <renmm6@chinaunicom.cn>
Date: Wed, 8 May 2019 02:16:24 +0000
Subject: [PATCH] Fix tox debug mode

- add oslotest in test-requirement.txt for
fixing tox debug mode failed.
- Update jsonschema/sphinx following the global-requirments.txt
to pass zuul requirements-check job.
(See: https://review.openstack.org/649789
https://review.opendev.org/#/c/657890/)

Change-Id: I5f2cabc35415cac3c4e81afa9084cbd8677ccd22
Story: #2005615
Task: #30862
---
 lower-constraints.txt | 1 +
 requirements.txt      | 2 +-
 test-requirements.txt | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 8412d23049..a59e6fd10e 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -89,6 +89,7 @@ oslo.serialization==2.18.0
 oslo.service==1.24.0
 oslo.upgradecheck==0.1.0
 oslo.utils==3.33.0
+oslotest==3.2.0
 osprofiler==1.4.0
 packaging==17.1
 passlib==1.7.0
diff --git a/requirements.txt b/requirements.txt
index a386515fa2..35bddbc9ce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,7 +23,7 @@ python-designateclient>=2.7.0 # Apache-2.0
 python-neutronclient>=6.7.0 # Apache-2.0
 python-glanceclient>=2.8.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
-jsonschema<3.0.0,>=2.6.0 # MIT
+jsonschema>=2.6.0 # MIT
 Jinja2>=2.10 # BSD License (3 clause)
 pexpect!=3.3,>=3.1 # ISC License
 oslo.config>=5.2.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 5c5f643d22..4801f23433 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@
 # Hacking already pins down pep8, pyflakes and flake8
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 bandit>=1.1.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 os-api-ref>=1.4.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
@@ -27,3 +26,4 @@ stestr>=1.1.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 astroid==1.6.5 # LGPLv2.1
 pylint==1.9.2 # GPLv2
+oslotest>=3.2.0 # Apache-2.0