From 9402f450ed14c44c2fb8b4f7eb63420b3743cfcf Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Wed, 27 Aug 2014 17:53:52 +0200
Subject: [PATCH] requirements: use django 1.6.6, travis: use django 1.5.9 and
 1.6.6, also test on python 3.4

---
 .travis.yml            | 9 +++++----
 requirements.d/all.txt | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a4d0ad..e53a31c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
     - "2.7"
     - "pypy"
     - "3.3"
+    - "3.4"
 env:
     global:
       - SECRET_KEY=justfortravis
@@ -13,15 +14,15 @@ env:
       - TEST_OPTS=""
       - COVERAGE=""
     matrix:
-      - DJANGO=1.5.5
-      - DJANGO=1.6.1
+      - DJANGO=1.5.9
+      - DJANGO=1.6.6
 matrix:
   exclude:
     - python: "2.7"
-      env: DJANGO=1.6.1
+      env: DJANGO=1.6.6
   include:
     - python: "2.7"
-      env: DJANGO=1.6.1 COVERAGE="coverage run -m" TEST_K="" TEST_OPTS="--pep8"
+      env: DJANGO=1.6.6 COVERAGE="coverage run -m" TEST_K="" TEST_OPTS="--pep8"
 install:
     - "pip install --use-mirrors Django==$DJANGO"
     - "pip install --use-mirrors -e ."
diff --git a/requirements.d/all.txt b/requirements.d/all.txt
index 6e0083c..c1126a9 100644
--- a/requirements.d/all.txt
+++ b/requirements.d/all.txt
@@ -1,5 +1,5 @@
 dnspython
-django==1.6.5
+django==1.6.6
 django-bootstrap-form
 django-registration
 South