travis: build on django 1.5 and 1.6

nsupdate-info · Dec 13, 2013 · cc4cd1c · cc4cd1c
1 parent e3104de
commit cc4cd1c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,16 @@ python:
     - "2.6"
     - "2.7"
     - "pypy"
+env:
+    global:
+      - SECRET_KEY=justfortravis
+    matrix:
+      - DJANGO=1.5.5
+      - DJANGO=1.6.1
 install:
-    - "pip install --upgrade --use-mirrors -e ."
-    - "pip install coveralls"
-env: SECRET_KEY=justfortravis
+    - "pip install --use-mirrors Django==$DJANGO"
+    - "pip install --use-mirrors -e ."
+    - "pip install --use-mirrors coveralls"
 script: "coverage run -m py.test --pep8"
 after_success:
     - coveralls

diff --git a/setup.py b/setup.py
@@ -42,8 +42,8 @@
     zip_safe=False,
     platforms='any',
     install_requires=[
-        'django >=1.5.3, <1.6',  # 1.5.3 has the session serializer configurable
-                                 # 1.6 is not tested yet
+        'django >=1.5.3, <1.7',  # 1.5.3 has the session serializer configurable
+                                 # 1.7 is not tested yet
         'dnspython',
         'south',
         'django-bootstrap-form',