Merge pull request #729 from alex/install-pep8-naming

Install pep8-naming on travis

2 files changed, 9 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index 681b9031..238ee9b7 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ import sys
 from distutils.command.build import build
 
 from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
+from setuptools.command.test import test
 
 base_dir = os.path.dirname(__file__)
 
@@ -71,9 +71,9 @@ class CFFIBuild(build):
         build.finalize_options(self)
 
 
-class PyTest(TestCommand):
+class PyTest(test):
     def finalize_options(self):
-        TestCommand.finalize_options(self)
+        test.finalize_options(self)
         self.test_args = []
         self.test_suite = True
 
diff --git a/tox.ini b/tox.ini
index b309f3c0..3ee449f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,12 +37,16 @@ commands =
 commands = py.test --capture=no --strict {posargs}
 
 [testenv:pep8]
-deps = flake8
+deps =
+    flake8
+    pep8-naming
 commands = flake8 .
 
 [testenv:py3pep8]
 basepython = python3.3
-deps = flake8
+deps =
+    flake8
+    pep8-naming
 commands = flake8 .
 
 [flake8]