Merge remote-tracking branch 'origin/master' into feat/user_preferences

# Conflicts:
#	herald/base.py
#	requirements.txt

.travis.yml

@@ -13,14 +13,15 @@ python:
 
 env:
   - DJANGO='https://github.com/django/django/archive/master.tar.gz'
-  - DJANGO='django==1.11rc1'
+  - DJANGO='django>=1.11.0,<1.12.0'
   - DJANGO='django>=1.10.0,<1.11.0'
   - DJANGO='django>=1.9.0,<1.10.0'
   - DJANGO='django>=1.8.0,<1.9.0'
 
 install:
+  - travis_retry pip install --upgrade pip setuptools wheel
   - travis_retry pip install --upgrade $DJANGO
-  - travis_retry pip install --upgrade coveralls six pytz mock twilio
+  - travis_retry pip install --upgrade -r requirements.txt
 
 script:
   - coverage run --source herald runtests.py -v 2
@@ -35,7 +36,7 @@ matrix:
     - python: "3.3"
       env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
     - python: "3.3"
-      env: DJANGO='django==1.11rc1'
+      env: DJANGO='django>=1.11.0,<1.12.0'
     - python: "3.3"
       env: DJANGO='django>=1.10.0,<1.11.0'
     - python: "3.3"

herald/base.py

@@ -286,26 +286,15 @@ def get_sent_from(self):
 
     @staticmethod
     def _send(recipients, text_content=None, html_content=None, sent_from=None, subject=None, extra_data=None):
-        client = TwilioTextNotification.setup_client()
-
-        num_of_messages = 0
-
-        for recipient in recipients:
-            client.messages.create(
-                body=text_content,
-                to=recipient,
-                from_=sent_from
-            )
-            num_of_messages += 1
-
-        return num_of_messages
-
-    @staticmethod
-    def setup_client():
         try:
-            import twilio
+            # twilio version 6
+            from twilio.rest import Client
         except ImportError:
-            raise Exception('Twilio is required for sending a TwilioTextNotification.')
+            try:
+                # twillio version < 6
+                from twilio.rest import TwilioRestClient as Client
+            except ImportError:
+                raise Exception('Twilio is required for sending a TwilioTextNotification.')
 
         try:
             account_sid = settings.TWILIO_ACCOUNT_SID
@@ -315,4 +304,10 @@ def setup_client():
                 'TWILIO_ACCOUNT_SID and TWILIO_AUTH_TOKEN settings are required for sending a TwilioTextNotification'
             )
 
-        return twilio.rest.TwilioRestClient(account_sid, auth_token)
+        client = Client(account_sid, auth_token)
+
+        client.messages.create(
+            body=text_content,
+            to=recipients[0],
+            from_=sent_from
+        )

requirements.txt

@@ -1,4 +1,5 @@
-django>=1.8
 six
 mock
-twilio==5.7.0
+twilio
+coveralls
+pytz

tests/test_notifications.py

@@ -1,7 +1,13 @@
 from django.core import mail
 from django.test import TestCase, override_settings
 from mock import patch
-from twilio.rest.resources import Messages
+
+try:
+    # twilio version 6
+    from twilio.rest.api.v2010.account import MessageList
+except ImportError:
+    # twillio version < 6
+    from twilio.rest.resources import Messages as MessageList
 
 from herald.base import NotificationBase, EmailNotification, TwilioTextNotification
 from herald.models import SentNotification
@@ -176,7 +182,7 @@ class TestNotification(TwilioTextNotification):
             to_number = '1231231234'
             template_name = 'hello_world'
 
-        with patch.object(Messages, 'create') as mocked_create:
+        with patch.object(MessageList, 'create') as mocked_create:
             TestNotification().send()
             mocked_create.assert_called_once_with(
                 body='Hello World',