From f6ce251e13415644b8975c974bf33fd074411726 Mon Sep 17 00:00:00 2001
From: Matthew Tretter <m@tthewwithanm.com>
Date: Wed, 6 Feb 2013 20:40:54 -0500
Subject: [PATCH] Fix setup.py test

---
 setup.py      | 14 +++++++++++++-
 testrunner.py | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 testrunner.py

diff --git a/setup.py b/setup.py
index 7c1495e..209d683 100644
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,31 @@
 #/usr/bin/env python
 import codecs
 import os
+from setuptools import setup, find_packages
 import sys
 
-from setuptools import setup, find_packages
+
+# Workaround for multiprocessing/nose issue. See http://bugs.python.org/msg170215
+try:
+    import multiprocessing
+except ImportError:
+    pass
+
 
 if 'publish' in sys.argv:
     os.system('python setup.py sdist upload')
     sys.exit()
 
+
 read = lambda filepath: codecs.open(filepath, 'r', 'utf-8').read()
 
+
 # Load package meta from the pkgmeta module without loading imagekit.
 pkgmeta = {}
 execfile(os.path.join(os.path.dirname(__file__),
          'imagekit', 'pkgmeta.py'), pkgmeta)
 
+
 setup(
     name='django-imagekit',
     version=pkgmeta['__version__'],
@@ -35,7 +45,9 @@ setup(
         'nose==1.2.1',
         'nose-progressive==1.3',
         'django-nose==1.1',
+        'PIL==1.1.7',
     ],
+    test_suite='testrunner.run_tests',
     install_requires=[
         'django-appconf>=0.5',
     ],
diff --git a/testrunner.py b/testrunner.py
new file mode 100644
index 0000000..e4d27c7
--- /dev/null
+++ b/testrunner.py
@@ -0,0 +1,19 @@
+# A wrapper for Django's test runner.
+# See http://ericholscher.com/blog/2009/jun/29/enable-setuppy-test-your-django-apps/
+# and http://gremu.net/blog/2010/enable-setuppy-test-your-django-apps/
+import os
+import sys
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+test_dir = os.path.dirname(__file__)
+sys.path.insert(0, test_dir)
+
+from django.test.utils import get_runner
+from django.conf import settings
+
+
+def run_tests():
+    cls = get_runner(settings)
+    runner = cls()
+    failures = runner.run_tests(['tests'])
+    sys.exit(failures)