From edb5604b98d773be00da978ac02e3aa42c45674a Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Thu, 9 May 2019 16:47:41 -0500 Subject: Stable branch combination fix We have two dueling problems in the stable branches that have to be fixed at the same time: * bandit 1.6.0 * sphinx 2.0 This is a squash of the two cherry-picks from master: ---------- Blacklist Bandit 1.6.0 due to directory exclusion bug Bandit 1.6.0 introduces a regression[0] with the -x option, a fix is expected to be included in 1.6.1 soon. [0] https://github.com/PyCQA/bandit/issues/488 [1] https://github.com/PyCQA/bandit/pull/489 Signed-off-by: Dean Troyer (cherry picked from commit 6385d64237c9973dd4c7dd53efb6664ea2c719da) ---------- Update sphinx requirement. Sphinx 2.0 no longer works on python 2.7, start cappingit there as well. (cherry picked from commit f1791179768115b6d074f70f9a8695f9c1e0b9f5) Change-Id: I0076645d9e1a2429efce39f51ceea679fa6c13cb --- doc/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/requirements.txt b/doc/requirements.txt index 597b54ed..6fd065e4 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.2 # BSD +sphinx>=1.6.2,!=1.6.6,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.6.2,!=1.6.6;python_version>='3.4' # BSD -- cgit v1.2.1