summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorgao.hanxiang <gao.hanxiang@99cloud.net>2019-05-14 18:03:26 +0800
committerZane Bitter <zbitter@redhat.com>2019-05-14 16:50:24 -0400
commit011fa22c42506e63229cca7e5fc65f81b6e0aabf (patch)
treeec367b70ca8006dde573ec296aee3d2c44a52553 /doc
parent563616967ddadb7790b6a4013a8fced0cd358deb (diff)
downloadheat-011fa22c42506e63229cca7e5fc65f81b6e0aabf.tar.gz
Blacklist bandit 1.6.0 and cap Sphinx on Python2
There's a regression[0] in bandit 1.6.0 which causes bandit to stop respecting excluded directories, and our tests throw a bunch of violations. Blacklist this version, but allow newer versions as there is already a pull request[1] to fix it, and I expect it will be included in the next release. Also fix the requirements job which was broken by https://review.opendev.org/657890 adding a cap on Sphinx on Python 2. [0] https://github.com/PyCQA/bandit/issues/488 [1] https://github.com/PyCQA/bandit/pull/489 Change-Id: Ieabcd4e8c5e5354125a63e89b9b60931c760858a
Diffstat (limited to 'doc')
-rw-r--r--doc/requirements.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 7488c4b07..94f9fa042 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,7 +4,8 @@
openstackdocstheme>=1.18.1 # Apache-2.0
os-api-ref>=1.4.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;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
reno>=2.5.0 # Apache-2.0
sphinxcontrib-apidoc>=0.2.0 # BSD
sphinxcontrib-httpdomain>=1.3.0 # BSD