Merge branch 'flake8' of https://github.com/sontek/pymemcache into switch_to_pytest

Conflicts:
	setup.cfg
	setup.py
	tox.ini

1 files changed, 6 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index 09c0e1f..9524d29 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34, docs
+envlist = py26, py27, pypy, py33, py34, docs, flake8
 
 [testenv]
 commands =
@@ -7,6 +7,11 @@ commands =
     pip install -e .
     py.test {posargs}
 
+[testenv:flake8]
+commands =
+	pip install flake8
+	flake8 .
+
 [testenv:docs]
 commands =
     pip install -r docs-requirements.txt