From: Charles Connell <charles@connells.org>
Date: Thu, 16 Jan 2014 00:34:11 +0000 (-0500)
Subject: Small 1.5 compatibility things
X-Git-Tag: release-20150131~255
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c7dcc25de;p=oweals%2Fkarmaworld.git

Small 1.5 compatibility things
---

diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py
index fd604a5..38381ba 100644
--- a/karmaworld/settings/common.py
+++ b/karmaworld/settings/common.py
@@ -280,6 +280,11 @@ AUTH_PROFILE_MODULE = 'users.UserProfile'
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
+    'filters': {
+         'require_debug_false': {
+             '()': 'django.utils.log.RequireDebugFalse'
+         }
+     },
     'handlers': {
         'console': {
             'level': 'INFO',
@@ -287,6 +292,7 @@ LOGGING = {
         },
         'mail_admins': {
             'level': 'ERROR',
+            'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
         }
     },
diff --git a/reqs/common.txt b/reqs/common.txt
index ca53bf9..cd8c876 100644
--- a/reqs/common.txt
+++ b/reqs/common.txt
@@ -7,7 +7,7 @@ supervisor==3.0b1
 oauth2client==1.0
 urllib3==1.5
 google-api-python-client==1.0
-django-grappelli==2.4.3
+django-grappelli==2.4.8
 lxml==3.1.0
 git+https://github.com/FinalsClub/django-taggit.git
 django-filepicker==0.1.5
diff --git a/reqs/dev.txt b/reqs/dev.txt
index 8f01b61..17e9725 100644
--- a/reqs/dev.txt
+++ b/reqs/dev.txt
@@ -1,6 +1,6 @@
 -r common.txt
 django-kombu==0.9.4
-django-debug-toolbar==0.9.4
+django-debug-toolbar
 ipython==0.13.1
 ipdb==0.7
 django-extensions==1.0.3 # some extra debugging tools for manage.py