Merge pull request #173 from rdegges/develop

Develop

Author: jheld

.travis.yml

@@ -3,20 +3,15 @@ language: python
 dist: xenial
 
 python:
-    - '3.4'
     - '3.5'
     - '3.6'
     - '3.7'
-    # - 'pypy'
-    # - 'pypy3'
-    - 'pypy3.5-6.0'
+    - '3.8'
+    - 'pypy3'
 
 env:
-    - DJANGO="django>=1.11,<2"
-    - DJANGO="django>=1.11.17,<2.0"
-    - DJANGO="django>=2.0,<2.1"
-    - DJANGO="django>=2.1,<2.2"
-    - DJANGO="django>=2.2,<3.0"
+    - DJANGO="django>=2.2,<2.2.8"
+    - DJANGO="django>=2.2.8,<3.0"
     - DJANGO="django>=3.0,<3.1"
 
 install:
@@ -28,22 +23,8 @@ script:
     - python manage.py test
 
 matrix:
-  exclude:
-    - python: "3.4"
-      env: DJANGO="django>=1.11.17,<2.0"
-    - python: "3.4"
-      env: DJANGO="django>=2.1,<2.2"
-    - python: "3.4"
-      env: DJANGO="django>=2.2,<3.0"
-    - python: "3.4"
-      env: DJANGO="django>=3.0,<3.1"
-    - python: "3.5"
-      env: DJANGO="django>=1.11.17,<2.0"
-    - python: "3.5"
-      env: DJANGO="django>=3.0,<3.1"
-    - python: "3.6"
-      env: DJANGO="django>=1.11.17,<2.0"
-    - python: "pypy3.5-6.0"
-      env: DJANGO="django>=1.11.17,<2.0"
-    - python: "3.7"
-      env: DJANGO="django>=1.11,<2.0"
+    exclude:
+        - python: "3.5"
+          env: DJANGO="django>=3.0,<3.1"
+        - python: "3.8"
+          env: DJANGO="django>=2.2,<2.2.8"

README.rst

@@ -33,11 +33,12 @@ Twilio makes it easy to send & receive SMS messages, and create & manage voice c
 
 Django-twilio makes it easy to use Twilio in your Django projects.
 
-Version 0.9.0 supports twilio 6.x and django 1.8-2.0.
+This project aims to keep compatibility with the supported Django releases.
 
-Version 0.9.2 has minimal py3.7 support and 0.9.2 & 0.9.3 also allows django 2.1
+As such our versions of python and django are designed to match that cadence as much as possible.
 
-For legacy twilio (5.x SDK), please see the 0.8 version.
+
+We are currently compatible with Django 2.2 and 3.0. Python versions 3.5 to 3.8.
 
 Documentation
 -------------

django_twilio/request.py

@@ -4,8 +4,6 @@
 
 from .exceptions import NotDjangoRequestException
 
-import six
-
 
 class TwilioRequest(object):
     '''
@@ -22,7 +20,7 @@ def _build_params(self, parameters):
         Build out the Twilio key/values from the parameters into attributes
         on this class.
         '''
-        for key, value in six.iteritems(parameters):
+        for key, value in parameters.items():
             if key == 'From':
                 setattr(self, 'from_', value)
             else:

django_twilio/south_migrations/0001_initial.py

@@ -35,11 +35,12 @@ User's Guide
 ------------
 
 
-Version 0.9.0 supports twilio 6.x and django 1.8-2.0.
+This project aims to keep compatibility with the supported Django releases.
 
-Version 0.9.2 has minimal py3.7 support and 0.9.2 & 0.9.3 also allows django 2.1
+As such our versions of python and django are designed to match that cadence as much as possible.
 
-For legacy twilio (5.x SDK), please see the 0.8 version.
+
+We are currently compatible with Django 2.2 and 3.0. Python versions 3.5 to 3.8.
 
 
 This part of the documentation contains an extensive walk through of