From 6e90533f491ba2a67e301b88c5913aa8b86d0f78 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Wed, 6 Nov 2013 17:43:25 +0100
Subject: Django 1.6 was released today and it's supported!

Fix #438.
---
 .travis.yml | 9 +++++----
 setup.py    | 2 +-
 tox.ini     | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a39532b..b332964 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,15 @@ python:
   - "3.2"
   - "3.3"
 env:
-  - DJANGO_VERSION=1.4.8
-  - DJANGO_VERSION=1.5.4
+  - DJANGO_VERSION=1.4.10
+  - DJANGO_VERSION=1.5.5
+  - DJANGO_VERSION=1.6
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO_VERSION=1.4.8
+      env: DJANGO_VERSION=1.4.10
     - python: "3.3"
-      env: DJANGO_VERSION=1.4.8
+      env: DJANGO_VERSION=1.4.10
 install:
   - pip install Django==$DJANGO_VERSION sqlparse
 script: make test
diff --git a/setup.py b/setup.py
index f9258e8..77b4024 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
     license='BSD',
     packages=find_packages(exclude=('tests', 'example')),
     install_requires=[
-        'django>=1.4.2,<1.6',
+        'django>=1.4.2,<1.7',
         'sqlparse',
     ],
     include_package_data=True,
diff --git a/tox.ini b/tox.ini
index 8a6caa9..b7fb6f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,25 +57,25 @@ deps =
 [testenv:py26-django16]
 basepython = python2.6
 deps =
-    https://www.djangoproject.com/download/1.6c1/tarball/
+    Django>=1.6,<1.7
     {[testenv]deps}
 
 [testenv:py27-django16]
 basepython = python2.7
 deps =
-    https://www.djangoproject.com/download/1.6c1/tarball/
+    Django>=1.6,<1.7
     {[testenv]deps}
 
 [testenv:py32-django16]
 basepython = python3.2
 deps =
-    https://www.djangoproject.com/download/1.6c1/tarball/
+    Django>=1.6,<1.7
     {[testenv]deps}
 
 [testenv:py33-django16]
 basepython = python3.3
 deps =
-    https://www.djangoproject.com/download/1.6c1/tarball/
+    Django>=1.6,<1.7
     {[testenv]deps}
 
 [testenv:flake8]
-- 
cgit v1.2.3