From 36bb1787c363c5dc4feba251f98aea20a8e23a6f Mon Sep 17 00:00:00 2001
From: Jannis Leidel
Date: Fri, 6 Apr 2012 13:09:01 +0200
Subject: Added a Django 1.4 test environment to Travis config.

---
 .travis.yml | 9 +++++++--
 setup.py    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bdc0686..d0565bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,10 @@ language: python
 python:
   - "2.6"
   - "2.7"
-install: python setup.py install
-script: python setup.py test
\ No newline at end of file
+env:
+  - DJANGO_VERSION=1.3.1
+  - DJANGO_VERSION=1.4
+install:
+  - pip install -q Django==$DJANGO_VERSION
+  - python setup.py install
+script: python setup.py test
diff --git a/setup.py b/setup.py
index a0a8814..88002e8 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
     license='BSD',
     packages=find_packages(exclude=('tests', 'example')),
     tests_require=[
-        'django>=1.1,<1.4',
+        'django>=1.1,<1.5',
         'dingus',
     ],
     test_suite='runtests.runtests',
-- 
cgit v1.2.3