From 0a3279107ffe483348cdf5ed4614537e72cbf62a Mon Sep 17 00:00:00 2001
From: Assaf Muller <amuller@redhat.com>
Date: Tue, 30 Jun 2015 14:56:28 -0400
Subject: [PATCH] Move pylint dep from tox.ini to test-requirements

This allows us to pin pylint from global requirements.

Closes-Bug: #1470186
Depends-On: Ibad8cd2911efbe075ea2629c543f6ce1f216c938
Change-Id: I31cc18e0b4cd32728f5814aa9dbf403104f72c72
---
 test-requirements.txt | 1 +
 tox.ini               | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 9bea5ff02f2..1eb3f7278ab 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -19,3 +19,4 @@ oslotest>=1.5.1 # Apache-2.0
 os-testr>=0.1.0
 tempest-lib>=0.5.0
 ddt>=0.7.0
+pylint==1.4.4  # GNU GPL v2
diff --git a/tox.ini b/tox.ini
index 12f2b91fbf3..48b3cc7ab07 100644
--- a/tox.ini
+++ b/tox.ini
@@ -78,14 +78,13 @@ downloadcache = ~/cache/pip
 basepython = python2.7
 deps =
   {[testenv]deps}
-  pylint
 commands=
   # If it is easier to add a check via a shell script, consider adding it in this file
   sh ./tools/misc-sanity-checks.sh
   {toxinidir}/tools/check_unit_test_structure.sh
   # Checks for coding and style guidelines
   flake8
-  # sh ./tools/coding-checks.sh --pylint '{posargs}'
+  sh ./tools/coding-checks.sh --pylint '{posargs}'
   neutron-db-manage --config-file neutron/tests/etc/neutron.conf check_migration
 whitelist_externals =
   sh