Removed django version check for collectfast.

This commit is contained in:
Kaveh 2015-03-12 08:58:01 -05:00
parent abd0883b61
commit 431f7a69a3
2 changed files with 4 additions and 7 deletions

View File

@ -37,6 +37,7 @@ Martin Blech
Andy Rose Andy Rose
Andrew Mikhnevich / @zcho Andrew Mikhnevich / @zcho
Kevin Ndung'u / @kevgathuku Kevin Ndung'u / @kevgathuku
Kaveh / @ka7eh
* Possesses commit rights * Possesses commit rights

View File

@ -7,8 +7,6 @@ Production Configurations
- Use sendgrid to send emails - Use sendgrid to send emails
- Use MEMCACHIER on Heroku - Use MEMCACHIER on Heroku
''' '''
import django
from configurations import values from configurations import values
# See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings # See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings
@ -83,12 +81,10 @@ class Production(Common):
AWS_AUTO_CREATE_BUCKET = True AWS_AUTO_CREATE_BUCKET = True
AWS_QUERYSTRING_AUTH = False AWS_QUERYSTRING_AUTH = False
# see: https://github.com/antonagestam/collectfast # See: https://github.com/antonagestam/collectfast
# For Django 1.7+, 'collectfast' should come before 'django.contrib.staticfiles'
AWS_PRELOAD_METADATA = True AWS_PRELOAD_METADATA = True
if django.VERSION < (1, 7): INSTALLED_APPS = ('collectfast', ) + INSTALLED_APPS
INSTALLED_APPS += ('collectfast', )
else:
INSTALLED_APPS = ('collectfast', ) + INSTALLED_APPS
# AWS cache settings, don't change unless you know what you're doing: # AWS cache settings, don't change unless you know what you're doing:
AWS_EXPIRY = 60 * 60 * 24 * 7 AWS_EXPIRY = 60 * 60 * 24 * 7