summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRocky Meza <rocky@fusionbox.com>2014-02-03 20:25:52 -0700
committerRocky Meza <rocky@fusionbox.com>2014-02-03 20:25:52 -0700
commit8d91831bd02838f89125aa3c89d2f79a9838590c (patch)
treec4543dfda57f2b45a0a2ec5f2612955ceb857819
parent6992c5e712db0ffd8517ec31d987d137d48fc3d4 (diff)
downloaddjango-pyscss-8d91831bd02838f89125aa3c89d2f79a9838590c.tar.gz
Added discover runner for Django < 1.6.
-rw-r--r--setup.py2
-rw-r--r--testproject/testproject/settings.py10
2 files changed, 11 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 83e5f90..a3a77d7 100644
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,10 @@ install_requires = [
tests_require = [
'Pillow',
'django-compressor>=1.3',
+ 'django-discover-runner',
]
+
version = (0, 0, 1, 'final')
diff --git a/testproject/testproject/settings.py b/testproject/testproject/settings.py
index 9eeb89f..632d72e 100644
--- a/testproject/testproject/settings.py
+++ b/testproject/testproject/settings.py
@@ -13,6 +13,11 @@ import os
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+from django import VERSION as DJANGO_VERSION
+if DJANGO_VERSION[:2] < (1, 6):
+ TEST_RUNNER = 'discover_runner.DiscoverRunner'
+
+
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
@@ -43,6 +48,9 @@ INSTALLED_APPS = (
'testproject.testapp2',
)
+if DJANGO_VERSION[:2] < (1, 6):
+ INSTALLED_APPS += ('discover_runner', )
+
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
@@ -108,7 +116,7 @@ LOGGING = {
'version': 1,
'disable_existing_loggers': True,
'handlers': {
- 'console':{
+ 'console': {
'level': 'DEBUG',
'class': 'logging.StreamHandler',
},