summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishakha Agarwal <agarwalvishakha18@gmail.com>2019-05-22 14:21:26 +0530
committerVishakha Agarwal <agarwalvishakha18@gmail.com>2019-07-04 04:46:58 +0000
commit319fd1a5321cb4271969886beed82c975b80d024 (patch)
tree632eefc1e2ee72ecbd6ae315ce60bdab48bfb316
parent890d3a10ad1b8ad822c975bb1366fc8f98eafc00 (diff)
downloadpython-keystoneclient-319fd1a5321cb4271969886beed82c975b80d024.tar.gz
Blacklist bandit 1.6.0 & cap sphinx for 2.7
The latest version of bandit has broken directory exclusion, so multiple test files are getting flagged. This change blocks version 1.6.0 while this issue is fixed for 1.6.1. This change also caps sphinx at <2.0.0 for python version 2.7. This also updates the keyring version. Change-Id: I69a86ef21791698e4dd749fe5640fcdc7df1b0fc
-rw-r--r--doc/requirements.txt3
-rw-r--r--test-requirements.txt5
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index e557e26..7e42ea9 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,7 +4,8 @@
# 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
lxml!=3.7.0,>=3.4.1 # BSD
fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 873b0e6..4683c46 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,8 @@ flake8-docstrings==0.2.1.post1 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
-keyring>=5.5.1 # MIT/PSF
+keyring>=5.5.1,<19.0.0;python_version=='2.7' # MIT/PSF
+keyring>=5.5.1;python_version>='3.4' # MIT/PSF
lxml!=3.7.0,>=3.4.1 # BSD
mock>=2.0.0 # BSD
oauthlib>=0.6.2 # BSD
@@ -20,4 +21,4 @@ testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
# Bandit security code scanner
-bandit>=1.1.0 # Apache-2.0
+bandit!=1.6.0,>=1.1.0 # Apache-2.0