Added testing for Python 3.5; removed 3.3

 language: python
-python:
-    - "2.7"
-    - "3.3"
-    - "3.4"
 env:
-    - DJANGO="Django>=1.8,<1.9"
-    - DJANGO="Django>=1.9,<1.10"
-    - DJANGO="Django>=1.10,<1.11"
-    - DJANGO=https://github.com/django/django/archive/master.tar.gz
-
-matrix:
-  exclude:
-  - python: "3.3"
-    env: DJANGO="Django>=1.9,<1.10"
-  - python: "3.3"
-    env: DJANGO="Django>=1.10,<1.11"
-  - python: "3.3"
-    env: DJANGO=https://github.com/django/django/archive/master.tar.gz
-  allow_failures:
-  - python: "2.7"
-    env: DJANGO=https://github.com/django/django/archive/master.tar.gz
-  - python: "3.4"
-    env: DJANGO=https://github.com/django/django/archive/master.tar.gz
-
+- TOXENV=py27-django18
+- TOXENV=py34-django18
+- TOXENV=py35-django18
+- TOXENV=py27-django19
+- TOXENV=py34-django19
+- TOXENV=py35-django19
+- TOXENV=py27-django110
+- TOXENV=py34-django110
+- TOXENV=py35-django110
+- TOXENV=py27-django-master
+- TOXENV=py34-django-master
+- TOXENV=py35-django-master
 install:
-    - pip install --pre $DJANGO
-script: python setup.py test
+- pip install tox
+script:
+- tox

@@ -9,7 +9,8 @@ Pending
 * Fixed a packaging error which caused sub-packages of the tests to be
   distributed.
 * Use ``get_current_site`` to look up the site instead of ``settings.SITE_ID``.
-* Dropped Django 1.7 and Python 3.2 support.
+* Dropped Django 1.7 and Python 3.2/3.3 support.
+* Added testing for Python 3.5.
 
 1.7.3 (2016-09-13)
 ------------------

@@ -33,8 +33,8 @@ setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,

 [tox]
 envlist =
-    py27-django18, py33-django18,
-    py27-django19, py34-django19,
-    py27-django110, py34-django110,
-    py27-master, py34-master
+    py{27,34,35}-django1{8,9,10}
+    py{27,34,35}-master
 
 [testenv]
+basepython =
+    py27: python2.7
+    py34: python3.4
+    py35: python3.5
 commands = {envpython} setup.py test
 setenv=
   PYTHONWARNINGS=default
-
-[testenv:py27-django18]
-basepython = python2.7
-deps = Django>=1.8,<1.9
-
-[testenv:py33-django18]
-basepython = python3.3
-deps = Django>=1.8,<1.9
-
-[testenv:py27-django19]
-basepython = python2.7
-deps = Django>=1.9,<1.10
-
-[testenv:py34-django19]
-basepython = python3.4
-deps = Django>=1.9,<1.10
-
-[testenv:py27-django110]
-basepython = python2.7
-deps = Django>=1.10,<1.11
-
-[testenv:py34-django110]
-basepython = python3.4
-deps = Django>=1.10,<1.11
-
-[testenv:py27-master]
-basepython = python2.7
-deps = https://github.com/django/django/archive/master.tar.gz
-
-[testenv:py34-master]
-basepython = python3.4
-deps = https://github.com/django/django/archive/master.tar.gz
+deps=
+    django-18: Django>=1.8,<1.9
+    django-19: Django>=1.9a1,<1.10
+    django-110: Django>=1.10a1,<1.11
+    django-master: https://github.com/django/django/archive/master.tar.gz