summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-06 10:45:40 +0000
committerGerrit Code Review <review@openstack.org>2019-06-06 10:45:40 +0000
commit03ca8c63256549ab2f204e89d225abb8b9ed0e6b (patch)
tree50544eabf5c03410ef0ebd846bc8da55a0e21f0a
parent4926adb62465bf819fca2dacd42454d4e9eb74df (diff)
parent683db4ae6c38f91f76ae618797077e128f483168 (diff)
downloadkolla-03ca8c63256549ab2f204e89d225abb8b9ed0e6b.tar.gz
kolla-03ca8c63256549ab2f204e89d225abb8b9ed0e6b.zip
Merge "Blacklist bandit 1.6.0"
-rw-r--r--doc/requirements.txt3
-rw-r--r--test-requirements.txt2
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 45d011067..ab68d4701 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,4 +4,5 @@
doc8>=0.6.0 # Apache-2.0
openstackdocstheme>=1.18.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,>=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 fffd0c820..18de5acca 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-bandit>=1.1.0 # Apache-2.0
+bandit!=1.6.0,>=1.1.0 # Apache-2.0
bashate>=0.5.1 # Apache-2.0
beautifulsoup4>=4.6.0 # MIT
coverage!=4.4,>=4.0 # Apache-2.0