Permalink
Browse files

fixes bug 914389 - South hijacking the test command, r=Pike

  • Loading branch information...
1 parent 067303e commit 85285865889a8b124bc2e21726487de7d91409a3 @peterbe peterbe committed Sep 9, 2013
Showing with 14 additions and 2 deletions.
  1. +14 −2 settings/base.py
View
@@ -82,7 +82,18 @@
'commonware.middleware.ScrubRequestOnException',
)
-INSTALLED_APPS += (
+INSTALLED_APPS = (
+ # a manually maintained list of apps "from funfactory"
+ 'funfactory',
+ 'compressor',
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.staticfiles',
+ 'commonware.response.cookies',
+ 'session_csrf',
+
+ # this elmo package itself
ROOT_PACKAGE,
# Local apps
@@ -114,9 +125,10 @@
'webby',
'elmo_commons',
+ # django-nose has to be last
+ 'django_nose',
)
-
## Auth
PWD_ALGORITHM = 'bcrypt'
HMAC_KEYS = {

0 comments on commit 8528586

Please sign in to comment.