diff --git a/requirements.txt b/requirements.txt index 4270c127..0bdede22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,6 @@ django-debug-toolbar==0.9.4 django-mailer==0.2a1 django-timezones==0.2 pytz==2012d -django_compressor==1.2a1 django-model-utils==1.1.0 django-mptt==0.5.2 diff --git a/symposion_project/settings.py b/symposion_project/settings.py index 1311eafd..f2e6c6a8 100644 --- a/symposion_project/settings.py +++ b/symposion_project/settings.py @@ -13,10 +13,6 @@ TEMPLATE_DEBUG = DEBUG # tells Pinax to serve media through the staticfiles app. SERVE_MEDIA = DEBUG -# django-compressor is turned off by default due to deployment overhead for -# most users. See for more information -COMPRESS = False - INTERNAL_IPS = [ "127.0.0.1", ] @@ -80,7 +76,6 @@ STATICFILES_DIRS = [ STATICFILES_FINDERS = [ "django.contrib.staticfiles.finders.FileSystemFinder", "django.contrib.staticfiles.finders.AppDirectoriesFinder", - "compressor.finders.CompressorFinder", ] # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a @@ -88,9 +83,6 @@ STATICFILES_FINDERS = [ # Examples: "http://foo.com/media/", "/media/". ADMIN_MEDIA_PREFIX = posixpath.join(STATIC_URL, "admin/") -# Subdirectory of COMPRESS_ROOT to store the cached media files in -COMPRESS_OUTPUT_DIR = "cache" - # Make this unique, and don't share it with anybody. SECRET_KEY = "8*br)9@fs!4nzg-imfrsst&oa2udy6z-fqtdk0*e5c1=wn)(t3" @@ -147,7 +139,6 @@ INSTALLED_APPS = [ "django_forms_bootstrap", # external - "compressor", "debug_toolbar", "mailer", "timezones",