From 4f467fbd73092aadda8b42e517bb60a4782064ae Mon Sep 17 00:00:00 2001 From: Kenneth Giusti Date: Mon, 13 May 2019 10:55:23 -0400 Subject: [PATCH] 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 capping it there as well. Change-Id: Ie6b379f2c99862c37891ac03c52464e07bc2b2cc --- doc/requirements.txt | 3 ++- test-requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 9df2d5b7d..f9c91a3db 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,7 +3,8 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # 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 reno>=2.5.0 # Apache-2.0 # imported when the source code is parsed for generating documentation: diff --git a/test-requirements.txt b/test-requirements.txt index e3852f54d..da96f0558 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -26,7 +26,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 pyngus>=2.2.0 # Apache-2.0 # Bandit security code scanner -bandit>=1.1.0 # Apache-2.0 +bandit>=1.1.0,<1.6.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT greenlet>=0.4.10 # MIT