summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHervé Beraud <hberaud@redhat.com>2019-05-16 14:40:04 +0200
committerHervé Beraud <hberaud@redhat.com>2019-05-16 16:30:18 +0200
commit74cc8cfe13bd55513524e26018669d75a7c3872b (patch)
treecc6edb1c922e48d54cd0903a05c63d8bb9a4b11f
parent0fa7d4a0656d0f9bea4cb92aa89ebdfa7cacc441 (diff)
downloadstevedore-74cc8cfe13bd55513524e26018669d75a7c3872b.tar.gz
Cap Bandit below 1.6.0 and update Sphinx requirement
Bandit 1.6.0 accidentally changed how the exclusion list option is handled and breaks our use of it. Cap to the previous version until Bandit has fixed the problem. Sphinx 2.0 no longer works on python 2.7, so we need to start marking it there as well. Change-Id: Ieaf9c77d62551352833a644ab22dff261c08bb78
-rw-r--r--doc/requirements.txt3
-rw-r--r--test-requirements.txt5
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index d959d44..1135398 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,4 +3,5 @@
# process, which may cause wedges in the gate later.
openstackdocstheme>=1.18.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0
-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,>=1.6.2;python_version>='3.4' # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index c641f92..bbe4106 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@ mock>=2.0.0 # BSD
coverage!=4.4,>=4.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0
# sphinx is needed for testing the sphinxext module
-sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
# Bandit security code scanner
-bandit>=1.1.0 # Apache-2.0
+bandit>=1.1.0,<1.6.0 # Apache-2.0