diff --git a/requirements.txt b/requirements.txt index 810531e..d1b6ada 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,6 @@ parsedatetime==1.5 psycopg2==2.6.1 py-bcrypt==0.4 pycrypto==2.6.1 -pylibmc==1.5.0 python-dateutil==2.4.2 python-mimeparse==0.1.4 python-postmark==0.4.7 diff --git a/settings.py b/settings.py index bdabdbd..d5c3eaa 100644 --- a/settings.py +++ b/settings.py @@ -25,13 +25,6 @@ if 'DATABASE_URL' in os.environ: "http_auth": es.username + ':' + es.password } -CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache', - 'LOCATION': '127.0.0.1:11211', - } -} - ABSOLUTE_URL_OVERRIDES = {'auth.user': lambda u: "/%s/" % u.username} ACCOUNT_ACTIVATION_DAYS = 0 ADMINS = (('Nick Sergeant', 'nick@snipt.net'),) @@ -133,9 +126,7 @@ LOGGING = { MIDDLEWARE_CLASSES = ( 'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', - 'django.middleware.cache.FetchFromCacheMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',