Support Django >= 1.7.

Author: aaugustin

.travis.yml

@@ -1,29 +1,24 @@
 language: python
 sudo: false
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
 env:
-  - DJANGO="Django>=1.4.0,<1.5.0"
-  - DJANGO="Django>=1.5.0,<1.6.0"
-  - DJANGO="Django>=1.6.0,<1.7.0"
   - DJANGO="Django>=1.7.0,<1.8.0"
   - DJANGO="Django>=1.8.0,<1.9.0"
+  - DJANGO="https://www.djangoproject.com/download/1.9a1/tarball/"
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO="Django>=1.4.0,<1.5.0"
+      env: DJANGO="https://www.djangoproject.com/download/1.9a1/tarball/"
     - python: "3.3"
-      env: DJANGO="Django>=1.4.0,<1.5.0"
-    - python: "3.4"
-      env: DJANGO="Django>=1.4.0,<1.5.0"
-      
-    - python: "2.6"
+      env: DJANGO="https://www.djangoproject.com/download/1.9a1/tarball/"
+    - python: "3.5"
       env: DJANGO="Django>=1.7.0,<1.8.0"
-    - python: "2.6"
+    - python: "3.5"
       env: DJANGO="Django>=1.8.0,<1.9.0"
 install:
   - pip install -e .

docs/changes.rst

@@ -4,6 +4,9 @@ Change log
 1.4
 ---
 
+This version is compatible with the upcoming Django 1.9 release. It requires
+Django 1.7 or later.
+
 New features
 ~~~~~~~~~~~~
 

example/README.rst

@@ -5,7 +5,7 @@ About
 -----
 
 This sample project demonstrates how to use the debug toolbar. It is designed
-to run under the latest stable version of Django, currently 1.5.x.
+to run under the latest stable version of Django.
 
 It also provides a few test pages to ensure the debug toolbar doesn't
 interfere with common JavaScript frameworks.

setup.py

@@ -14,7 +14,7 @@
     license='BSD',
     packages=find_packages(exclude=('tests.*', 'tests', 'example')),
     install_requires=[
-        'Django>=1.4.2',
+        'Django>=1.7',
         'sqlparse',
     ],
     include_package_data=True,
@@ -28,12 +28,12 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )

tox.ini

@@ -1,24 +1,24 @@
 [tox]
 envlist =
-    py{26,27}-django14,
-    py{26,27,32,33}-django{15,16},
     py{27,32,33,34}-django{17,18},
+    py{27,34,35}-django19,
     flake8
 
 [testenv]
 basepython =
-    py26: python2.6
     py27: python2.7
     py32: python3.2
     py33: python3.3
     py34: python3.4
+    py34: python3.5
 commands = make test
 deps =
     django14: Django>=1.4,<1.5
     django15: Django>=1.5,<1.6
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
-    django18: https://www.djangoproject.com/download/1.8b1/tarball/
+    django18: Django>=1.8,<1.9
+    django19: https://www.djangoproject.com/download/1.9a1/tarball/
     django-discover-runner
     selenium
     sqlparse
@@ -28,7 +28,7 @@ whitelist_externals = make
 
 [testenv:flake8]
 basepython =
-    python2.6
+    python2.7
 commands = make flake8
 deps =
     flake8