Commits

Luke Plant  committed 4d796ae Merge

Merged from default

  • Participants
  • Parent commits 1e2afc7, 678ead0
  • Branches live

Comments (0)

Files changed (7)

File cciw/cciwmain/views/misc.py

 Message:
 %(message)s
 
-""" % locals(), "website@cciw.co.uk", [settings.FEEDBACK_EMAIL_TO])
+""" % locals(), settings.SERVER_EMAIL, [settings.FEEDBACK_EMAIL_TO])
 
 class FeedbackForm(CciwFormMixin, forms.Form):
     email = forms.EmailField(label="Email address", max_length=320)

File cciw/forums/models.py

 
 """ % {'from': from_member.user_name, 'to': to_member.user_name,
         'domain': common.get_current_domain(), 'message': text},
-        "website@cciw.co.uk", [to_member.email])
+        settings.SERVER_EMAIL, [to_member.email])
         return msg
 
 

File cciw/forums/views/memberadmin.py

 ignore this e-mail.
 
 """ % {'domain': common.get_current_domain(), 'email': urllib.quote(email), 'hash': email_hash(email)},
-"website@cciw.co.uk", [email])
+                   settings.SERVER_EMAIL, [email])
 
 
 def send_username_reminder(member):
 
 Thanks.
 """ % {'domain': common.get_current_domain(), 'user_name': member.user_name },
-    "website@cciw.co.uk", [member.email])
+    settings.SERVER_EMAIL, [member.email])
 
 
 def send_newpassword_email(member):
 
 """ % {'domain': common.get_current_domain(), 'user_name': member.user_name,
        'password': password, 'hash': hash},
-    "website@cciw.co.uk", [member.email])
+    settings.SERVER_EMAIL, [member.email])
 
 
 def create_new_password_hash(password, user_name):
 """ % {'domain': common.get_current_domain(), 'email': urllib.quote(new_email),
        'user_name': urllib.quote(member.user_name),
        'hash': email_and_username_hash(new_email, member.user_name)},
-    "website@cciw.co.uk", [new_email])
+    settings.SERVER_EMAIL, [new_email])
 
 
 #################  VIEW FUNCTIONS #####################

File cciw/settings.py

 SECUREDOWNLOAD_TIMEOUT = 3600
 
 if DEVBOX:
-    SECUREDOWNLOAD_SOURCE = os.path.join(parentdir, "protected_downloads_src")
-    SECUREDOWNLOAD_SERVE_ROOT = os.path.join(parentdir, "protected_downloads")
+    SECUREDOWNLOAD_SOURCE = os.path.join(parentdir, "secure_downloads_src")
+    SECUREDOWNLOAD_SERVE_ROOT = os.path.join(parentdir, "secure_downloads")
 else:
     from cciw.settings_priv import SECUREDOWNLOAD_SOURCE, SECUREDOWNLOAD_SERVE_ROOT
 
 #                github or bitbucket under the account 'spookylukey'.  Currently
 #                includes:
 #                 - diff_match_patch from google
-#                 - django
 #                 - django-autocomplete
 #                 - django-mailer
 #
 #
 #  usermedia/  - corresponds to MEDIA_ROOT
 #
-#  protected_downloads/     - corresponds to SECUREDOWNLOAD_SERVE_ROOT
+#  secure_downloads/     - corresponds to SECUREDOWNLOAD_SERVE_ROOT
 #
-#  protected_downloads_src/ - corresponds to SECUREDOWNLOAD_SOURCE
+#  secure_downloads_src/ - corresponds to SECUREDOWNLOAD_SOURCE
 #
 # === Deployment ===
 #
 
 @runs_once
 def ensure_dependencies():
-    with lcd(parent_dir):
-        hg_branch = local("cd deps/django; hg branch", capture=True)
-        if hg_branch.strip() != 'default':
-            abort("Django src on incorrect branch")
+    pass
 
 
 def test():
     # Update virtualenv in new dir.
     with cd(version.src_dir):
         # We should already have a virtualenv, but it will need paths updating
-        run("virtualenv --python=python2.5 env")
+        run("virtualenv --python=python2.7 env")
         # Need this to stop ~/lib/ dirs getting in:
-        run("touch env/lib/python2.5/sitecustomize.py")
+        run("touch env/lib/python2.7/sitecustomize.py")
         with virtualenv(version.venv_dir):
             with cd(version.project_dir):
                 run_venv("pip install -r requirements.txt")
         pth_name = "deps.pth"
         with open(pth_name, "w") as fd:
             fd.write(pth_file)
-        put(pth_name, join(version.venv_dir, "lib/python2.5/site-packages"))
+        put(pth_name, join(version.venv_dir, "lib/python2.7/site-packages"))
         os.unlink(pth_name)
 
 
 
 def _copy_protected_downloads():
     # We currently don't need this to be separate for staging and production
-    rsync_dir(join(parent_dir, "protected_downloads_src"),
+    rsync_dir(join(parent_dir, "secure_downloads_src"),
               join(webapps_root, 'cciw_protected_downloads_src'))
 
 
-#!/usr/bin/env python2.5
+#!/usr/bin/env python2.7
 import warnings
 #warnings.simplefilter("error", PendingDeprecationWarning)
 import os

File requirements.txt

 xlwt==0.7.2
 xlrd==0.7.1
 creole>=1.2
+-e hg+https://bitbucket.org/spookylukey/django/@00f11ed96fe8#egg=django