From 369b76061f1e874e24f93551fda0e9b421c5b149 Mon Sep 17 00:00:00 2001
From: Brant Knudson <bknudson@us.ibm.com>
Date: Wed, 3 Jun 2015 20:47:38 -0500
Subject: [PATCH] Move bandit requirement to test-requirements.txt

The update script for requirements doesn't update
test-requirements-bandit.txt automatically. Rather than update
that script, move the bandit requirement into
test-requirements.txt instead.

Change-Id: I331ffd378d80943b8884b4a62493096c54ad8948
---
 test-requirements-bandit.txt | 1 -
 test-requirements.txt        | 4 ++++
 tox.ini                      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 test-requirements-bandit.txt

diff --git a/test-requirements-bandit.txt b/test-requirements-bandit.txt
deleted file mode 100644
index b21da7f0..00000000
--- a/test-requirements-bandit.txt
+++ /dev/null
@@ -1 +0,0 @@
-bandit>=0.10.1
diff --git a/test-requirements.txt b/test-requirements.txt
index c87974f5..e13a83a4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -19,3 +19,7 @@ testrepository>=0.0.18
 testresources>=0.2.4
 testtools>=0.9.36,!=1.2.0
 python-memcached>=1.48
+
+# Bandit security code scanner
+bandit>=0.10.1
+
diff --git a/tox.ini b/tox.ini
index c15dcd97..403cc49b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,7 @@ downloadcache = ~/cache/pip
 commands = oslo_debug_helper {posargs}
 
 [testenv:bandit]
-deps = -r{toxinidir}/test-requirements-bandit.txt
+deps = -r{toxinidir}/test-requirements.txt
 commands = bandit -c bandit.yaml -r keystonemiddleware -n5 -p keystone_conservative
 
 [flake8]