First pass at trying to fix problems in pip install -r requirements

pull/1/head
Raymond Yee 2014-10-16 15:12:34 -07:00
parent 9ba17660e5
commit b847771089
2 changed files with 11 additions and 7 deletions

View File

@ -14,7 +14,8 @@ boto==2.8.0
#git+ssh://git@github.com/Gluejar/boto.git@2.3.0 #git+ssh://git@github.com/Gluejar/boto.git@2.3.0
celery==3.0.9 celery==3.0.9
# pip installing pillow seems to delete distribute # pip installing pillow seems to delete distribute
distribute==0.6.28 # but having distribute in requirements starting to cause problems
# distribute==0.6.28
django-celery==3.0.9 django-celery==3.0.9
#django-ckeditor==3.6.2.1 #django-ckeditor==3.6.2.1
git+ssh://git@github.com/Gluejar/django-ckeditor.git@3.6.2.1.post20131230 git+ssh://git@github.com/Gluejar/django-ckeditor.git@3.6.2.1.post20131230
@ -52,7 +53,7 @@ pymarc==2.8.8
python-dateutil==2.1 python-dateutil==2.1
python-openid==2.2.5 python-openid==2.2.5
pytz==2012d pytz==2012d
rdflib==2.4.0 rdflib==2.4.1
redis==2.6.2 redis==2.6.2
reportlab==3.1.8 reportlab==3.1.8
requests==2.4.3 requests==2.4.3

View File

@ -130,12 +130,15 @@ CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
# local settings for maintenance mode # local settings for maintenance mode
MAINTENANCE_MODE = False MAINTENANCE_MODE = False
# Amazon credentials (for fps) # Amazon keys to permit S3 access
AWS_ACCESS_KEY = '' # reusing just cedentials here
AWS_SECRET_ACCESS_KEY = ''
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
AWS_ACCESS_KEY_ID = 'AKIAIYP6XRVAUWKQFT5Q'
AWS_SECRET_ACCESS_KEY = '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'
AWS_STORAGE_BUCKET_NAME = 'just-unglueit'
# choice of payment processor
PAYMENT_PROCESSOR = 'paypal'
# if settings/local.py exists, import those settings -- allows for dynamic generation of parameters such as DATABASES # if settings/local.py exists, import those settings -- allows for dynamic generation of parameters such as DATABASES
try: try: