Remove dependency on django-mailer
Nothing is using it, so there's no need to install and configure it. Change-Id: I11d34b965606d7660d812202c79b65c07b4f41d3 Signed-off-by: Julien Danjou <julien.danjou@enovance.com>
This commit is contained in:
@@ -30,7 +30,6 @@ pycrypto = 2.3
|
||||
recipe = zc.recipe.egg
|
||||
eggs =
|
||||
python-dateutil
|
||||
django-mailer
|
||||
httplib2
|
||||
python-cloudfiles
|
||||
coverage
|
||||
|
||||
@@ -37,8 +37,7 @@ INSTALLED_APPS = (
|
||||
'horizon.tests',
|
||||
'horizon.dashboards.nova',
|
||||
'horizon.dashboards.syspanel',
|
||||
'horizon.dashboards.settings',
|
||||
'mailer')
|
||||
'horizon.dashboards.settings')
|
||||
|
||||
MIDDLEWARE_CLASSES = (
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
@@ -85,10 +84,7 @@ NOSE_ARGS = ['--nocapture',
|
||||
# For nose-selenium integration
|
||||
LIVE_SERVER_PORT = 8000
|
||||
|
||||
# django-mailer uses a different config attribute
|
||||
# even though it just wraps django.core.mail
|
||||
MAILER_EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
|
||||
EMAIL_BACKEND = MAILER_EMAIL_BACKEND
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
|
||||
SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
|
||||
|
||||
HORIZON_CONFIG = {
|
||||
|
||||
@@ -91,7 +91,6 @@ INSTALLED_APPS = (
|
||||
'horizon.dashboards.nova',
|
||||
'horizon.dashboards.syspanel',
|
||||
'horizon.dashboards.settings',
|
||||
'mailer',
|
||||
)
|
||||
|
||||
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
|
||||
|
||||
@@ -21,9 +21,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||
# Or send them to /dev/null
|
||||
#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
|
||||
|
||||
# django-mailer uses a different settings attribute
|
||||
MAILER_EMAIL_BACKEND = EMAIL_BACKEND
|
||||
|
||||
# Configure these for your outgoing email host
|
||||
# EMAIL_HOST = 'smtp.my-company.com'
|
||||
# EMAIL_PORT = 25
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
coverage
|
||||
CherryPy
|
||||
Django==1.3
|
||||
django-mailer
|
||||
django-nose==0.1.2
|
||||
django-nose-selenium
|
||||
django-registration==0.7
|
||||
|
||||
Reference in New Issue
Block a user