Refactoring to make testing more stable

setup.py

@@ -1,16 +1,15 @@
 import os
 
-from setuptools import setup
-
 with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
     README = readme.read()
 
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
-from distutils.core import setup, Command
+from setuptools import setup, Command
 # you can also import from setuptools
 
 class PyTest(Command):
     user_options = []
+
     def initialize_options(self):
         pass
 
@@ -20,9 +19,11 @@ class PyTest(Command):
     def run(self):
         import subprocess
         import sys
+
         errno = subprocess.call([sys.executable, 'runtests.py'])
         raise SystemExit(errno)
 
+
 setup(
     name='django-q',
     version='0.1.0',
@@ -33,10 +34,8 @@ setup(
     license='MIT',
     description='A multiprocessing task queue for Django',
     long_description=README,
-    include_package_data=True,
     install_requires=['django>=1.7', 'redis', 'coloredlogs', 'django-picklefield', 'jsonpickle'],
-    test_suite='django_q.tests',
-    cmdclass = {'test': PyTest},
+    cmdclass={'test': PyTest},
     classifiers=[
         'Development Status :: 2 - PreAlpha',
         'Environment :: Web Environment',