From e46976c02ff2c9eef51c791910dd7d91b27a6196 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Fri, 24 May 2019 16:54:29 +0000 Subject: [PATCH] Cap Bandit below 1.6.0, update sphinx requirement, uncap jsonschema Bandit 1.6.0 accidentally changed how the exclusion list option is handled and breaks our use of it. Since we generally cap linters and only move them forward when we're ready to deal with the fallout, cap Bandit to the previous version until we have a reason to move to a newer version. Sphinx 2.0 no longer works on python 2.7, so we need to start capping it there as well. The jsonschema cap was removed in g-r so we need to remove it here too. Change-Id: Ie8f45e4130297b50a8e98031f3f01244e646bec7 --- doc/requirements.txt | 3 ++- test-requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 03ec55f7..2faa201c 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,7 +3,8 @@ # process, which may cause wedges in the gate later. # These are needed for docs generation 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 mock>=2.0.0 # BSD diff --git a/test-requirements.txt b/test-requirements.txt index e7a9a8b7..961f99ce 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,11 +5,11 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 testtools>=2.2.0 # MIT coverage!=4.4,>=4.0 # Apache-2.0 -jsonschema<3.0.0,>=2.6.0 # MIT +jsonschema>=2.6.0 # MIT stestr>=2.0.0 # Apache-2.0 mock>=2.0.0 # BSD fixtures>=3.0.0 # Apache-2.0/BSD # Bandit security code scanner -bandit>=1.1.0 # Apache-2.0 +bandit>=1.1.0,<1.6.0 # Apache-2.0