From 8daef25ef9b484cf921bc96320cc154490f11bd0 Mon Sep 17 00:00:00 2001
From: amitgandhinz <amit.gandhi@rackspace.com>
Date: Thu, 7 Aug 2014 17:06:03 -0400
Subject: [PATCH] added pylint and cleaned up test-requirements

---
 tests/test-requirements.txt | 30 ++++++++----------------------
 tox.ini                     | 18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt
index 9dc40c1a..8e93a1b4 100644
--- a/tests/test-requirements.txt
+++ b/tests/test-requirements.txt
@@ -1,23 +1,9 @@
-# Metrics and style
-hacking>=0.5.6,<0.8
-
-# Packaging
-mock>=1.0
-
-# Unit Tests
-ddt>=0.4.0
-discover
-fixtures>=0.3.14
-httpretty>=0.6.3
-python-subunit
-testrepository>=0.0.17
-testtools>=0.9.32
-
-# Functional Tests
-requests>=1.1
-
-# Test runner
-nose
-nose-exclude
-openstack.nose_plugin>=0.7
 coverage
+ddt
+fixtures
+hacking
+mock
+nose
+openstack.nose_plugin
+requests
+testtools
diff --git a/tox.ini b/tox.ini
index 28c7330b..dcd49335 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py33,pypy,pep8,cover
+envlist = py26,py27,py33,pypy,pep8,lint2,lint3,cover
 skipsdist = True
 
 [testenv]
@@ -24,6 +24,20 @@ downloadcache = ~/cache/pip
 [testenv:pep8]
 commands = flake8
 
+[testenv:lint2]
+basepython = python2
+deps = {[testenv]deps}
+       pylint
+commands = pylint ./poppy
+           pylint ./tests
+
+[testenv:lint3]
+basepython = python3
+deps = {[testenv]deps}
+       pylint
+commands = pylint ./poppy
+           pylint ./tests
+
 [testenv:cover]
 setenv = NOSE_WITH_COVERAGE=1
 
@@ -35,4 +49,4 @@ builtins = __CDN_SETUP__
 exclude = .venv*,venv*,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*.egg,.update-venv
 
 [hacking]
-import_exceptions = cdn.openstack.common.gettextutils._
+import_exceptions = poppy.openstack.common.gettextutils._