jerith

diff --git a/.travis.yml b/.travis.yml
index 3d5c68e..9e8972f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ before_script:
   - sudo riak-admin member-status
 script:
   - if [ -z "$NO_COVERAGE" ]; then COVERAGE_CMD="coverage run --source=vumi"; else COVERAGE_CMD=""; fi
-  - VUMITEST_REDIS_DB=1 VUMI_TEST_NODE_PATH="$(which node)" $COVERAGE_CMD `which trial` vumi
+  - VUMI_TEST_TIMEOUT=10 VUMITEST_REDIS_DB=1 VUMI_TEST_NODE_PATH="$(which node)" $COVERAGE_CMD `which trial` vumi

jerith

diff --git a/sideloader/templates/help/index.html b/sideloader/templates/help/index.html
index df321d8..6d66191 100644
--- a/sideloader/templates/help/index.html
+++ b/sideloader/templates/help/index.html
@@ -98,9 +98,11 @@ $manage collectstatic --noinput</pre>
       </p>
       <p><h3>virtualenv_prefix:</h3>
       If set, this specifies a name prefix for the virtualenv created at install time. This allows different packages to have their own virtualenvs instead of sharing the default virtualenv.
+      <pre>virtualenv_prefix: my-project</pre>
       </p>

jerith

The following is an email I sent regarding the proposed legislation at http://www.gov.za/documents/films-and-publications-act-draft-online-regulation-policy-comments-invited-14-feb-2015

I didn't bother with the flagrant disregard to privacy and freedom of expression, because plenty of other people are shouting about that. Instead, I focused on the effect it would have on my ability to improve my professional skillset.

-----

Good day,

I am a professional software developer, and an important part of my occupation is honing my skillset and keeping up to date on advances in my field. In order to do this, I contribute to various open source software projects and take part in online events such as Ludum Dare[1]. I have not chosen to work in a field regulated by the FPB and I do not seek to actively market the games (or other software) I create in South Africa or anywhere else, but I do make them available online for others to review, critique, and occasionally derive entertainment from.

jerith

diff --git a/setup.py b/setup.py
index 0139197..54b4dda 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup(
         'django-registration==1.0',
         'lesscpy==0.9h',
         'xlrd==0.8.0',
-        'requests',
+        'requests>=1.0',

jerith

diff --git a/go/apps/bulk_message/tests/test_vumi_app.py b/go/apps/bulk_message/tests/test_vumi_app.py
index ea0cb5f..10e8acc 100644
--- a/go/apps/bulk_message/tests/test_vumi_app.py
+++ b/go/apps/bulk_message/tests/test_vumi_app.py
@@ -17,6 +17,12 @@ from go.apps.tests.helpers import AppWorkerHelper
 from go.vumitools.api import VumiApiCommand
 
 
+class BreakerError(Exception):
+    """

jerith

diff --git a/go/apps/bulk_message/tests/test_vumi_app.py b/go/apps/bulk_message/tests/test_vumi_app.py
index ea0cb5f..d3d1bc3 100644
--- a/go/apps/bulk_message/tests/test_vumi_app.py
+++ b/go/apps/bulk_message/tests/test_vumi_app.py
@@ -359,6 +359,8 @@ class TestBulkMessageApplication(VumiTestCase):
         send_progress = yield self.app.get_send_progress(conversation, cmd_id)
         self.assertEqual(send_progress, None)
 
+        self.flushLoggedErrors()
+

jerith

diff --git a/setup.py b/setup.py
index 73b850f..c1c16c1 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ setup(
         'redis>=2.10.0',
         'txredis',
         'python-smpp>=0.1.5',
-        'pytz==2013b',
+        'pytz',

jerith

diff --git a/setup.py b/setup.py
index 68269bb..ce8a125 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
         'service_identity',
         'txssmi>=0.3.0',
         'wokkel',
-        'redis>=2.7.1',
+        'redis>=2.10.0',

jerith

diff --git a/.coveragerc b/.coveragerc
index 612ec54..2425b39 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,6 @@
 [run]
 branch = True
-source = vumi
+source = vumi_message_store
 

jerith

diff --git a/.travis.yml b/.travis.yml
index b694f23..f9ae46d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,15 @@ node_js:
   - "0.10"
 env:
   - RIAK_VERSION="1.4.12-1" VUMITEST_REDIS_DB=1 VUMIGO_TEST_DB=postgres VUMI_TEST_TIMEOUT=10
-matrix:
-  include: