Commits

Luke Plant committed 7953073 Merge

Automated merge with file:///home/luke/devel/cciw.co.uk/src

Comments (0)

Files changed (4)

 - You need to create a cciw/settings_priv.py with the various settings that I cannot
   release publicly (database, passwords, secret key).
 
-  This must in turn pull in from either settings_production.py or settings_staging.py
+  To be able to deploy, you need also need settings_production.py or settings_staging.py
   The fabfile depends on these files existing.
 
 - For creating the database, there is a complete set of South migration
 Tests
 =====
 
-./manage.py test --settings=cciw.settings_tests cciw
+Tests can be run like so:
+
+$ fab test
+
+or
+
+$ ./manage.py test --settings=cciw.settings_tests cciw
+

cciw/cciwmain/imageutils.py

 
 from django.conf import settings
 import os
-import ImageFile
+from PIL import ImageFile
 import tempfile
 
 def parse_image(filename):
 if LIVEBOX:
     from cciw.settings_priv import PRODUCTION, STAGING, GOOGLE_ANALYTICS_ACCOUNT
 
-from cciw.settings_priv import PAYPAL_TEST, PAYPAL_RECEIVER_EMAIL
+from cciw.settings_priv import PAYPAL_TEST # boolean indicating PayPal test mode
+from cciw.settings_priv import PAYPAL_RECEIVER_EMAIL # Email address of PayPal receiving account
+from cciw.settings_priv import SECRET_KEY
 
 WEBSERVER_RUNNING = 'mod_wsgi' in sys.argv
 
 ### MISC ###
 
-from cciw.settings_priv import SECRET_KEY
-
 if DEVBOX:
     DEBUG = True
     TEMPLATE_DEBUG = True
 gunicorn
 psutil
 fabric==1.6.0
-webtest
-django-webtest
+WebTest==2.0.11
+django-webtest==1.7.5
 -e git://github.com/benjaoming/django-wiki@844438366bebf40ad91b02a64dd3e7a518e4b8c8#egg=wiki
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.