From 254e5493c60daaa7394532c35842e1e663597c6f Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 00:34:45 +0200
Subject: [PATCH 01/11] bumped django 1.4.10 to 1.4.18

---
 .travis.yml | 6 +++---
 tox.ini     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index edaae71..e3ff33f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ python:
   - 3.3
 
 env:
-  - DJANGO=Django==1.4.10 SOUTH=1
+  - DJANGO=Django==1.4.18 SOUTH=1
   - DJANGO=Django==1.5.5 SOUTH=1
   - DJANGO=Django==1.6.1 SOUTH=1
   - DJANGO=https://github.com/django/django/tarball/master SOUTH=1
@@ -26,9 +26,9 @@ matrix:
    - python: 2.6
      env: DJANGO=https://github.com/django/django/tarball/master SOUTH=1
    - python: 3.2
-     env: DJANGO=Django==1.4.10 SOUTH=1
+     env: DJANGO=Django==1.4.18 SOUTH=1
    - python: 3.3
-     env: DJANGO=Django==1.4.10 SOUTH=1
+     env: DJANGO=Django==1.4.18 SOUTH=1
   include:
    - python: 2.7
      env: DJANGO=Django==1.5.5 SOUTH=0
diff --git a/tox.ini b/tox.ini
index b754bc7..d6b65ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ commands = coverage run -a setup.py test
 [testenv:py26-1.4]
 basepython = python2.6
 deps =
-    Django == 1.4.10
+    Django == 1.4.18
     South == 0.7.6
     coverage == 3.6
 
@@ -35,7 +35,7 @@ deps =
 [testenv:py27-1.4]
 basepython = python2.7
 deps =
-    Django == 1.4.10
+    Django == 1.4.18
     South == 0.8.1
     coverage == 3.6
 

From a0ffbf0b3998d82a921e6b23e777dcff02d2d761 Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 00:57:40 +0200
Subject: [PATCH 02/11] bumped django 1.5.5 to 1.5.12

---
 .travis.yml | 4 ++--
 tox.ini     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3ff33f..e984ea3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
 
 env:
   - DJANGO=Django==1.4.18 SOUTH=1
-  - DJANGO=Django==1.5.5 SOUTH=1
+  - DJANGO=Django==1.5.12 SOUTH=1
   - DJANGO=Django==1.6.1 SOUTH=1
   - DJANGO=https://github.com/django/django/tarball/master SOUTH=1
 
@@ -31,6 +31,6 @@ matrix:
      env: DJANGO=Django==1.4.18 SOUTH=1
   include:
    - python: 2.7
-     env: DJANGO=Django==1.5.5 SOUTH=0
+     env: DJANGO=Django==1.5.12 SOUTH=0
 
 after_success: coveralls
diff --git a/tox.ini b/tox.ini
index d6b65ae..9befbb6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,13 +63,13 @@ deps =
 [testenv:py27-1.5-nosouth]
 basepython = python2.7
 deps =
-    Django == 1.5.5
+    Django == 1.5.12
     coverage == 3.6
 
 [testenv:py32-1.5]
 basepython = python3.2
 deps =
-    Django == 1.5.5
+    Django == 1.5.12
     South == 0.8.1
     coverage == 3.6
 
@@ -90,7 +90,7 @@ deps =
 [testenv:py33-1.5]
 basepython = python3.3
 deps =
-    Django == 1.5.5
+    Django == 1.5.12
     South == 0.8.1
     coverage == 3.6
 

From be55ed742702efbe2de9a9f4ff1e7d5cdea16103 Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 00:59:10 +0200
Subject: [PATCH 03/11] bumped django 1.6.1 to 1.6.10

---
 .travis.yml | 2 +-
 tox.ini     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e984ea3..aa58aa0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
 env:
   - DJANGO=Django==1.4.18 SOUTH=1
   - DJANGO=Django==1.5.12 SOUTH=1
-  - DJANGO=Django==1.6.1 SOUTH=1
+  - DJANGO=Django==1.6.10 SOUTH=1
   - DJANGO=https://github.com/django/django/tarball/master SOUTH=1
 
 install:
diff --git a/tox.ini b/tox.ini
index 9befbb6..0efa45f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,7 +49,7 @@ deps =
 [testenv:py27-1.6]
 basepython = python2.7
 deps =
-    Django == 1.6.1
+    Django == 1.6.10
     South == 0.8.1
     coverage == 3.6
 
@@ -76,7 +76,7 @@ deps =
 [testenv:py32-1.6]
 basepython = python3.2
 deps =
-    Django == 1.6.1
+    Django == 1.6.10
     South == 0.8.1
     coverage == 3.6
 
@@ -97,7 +97,7 @@ deps =
 [testenv:py33-1.6]
 basepython = python3.3
 deps =
-    Django == 1.6.1
+    Django == 1.6.10
     South == 0.8.1
     coverage == 3.6
 

From 8796f05ae3a2076157b0164e440c248519fe25ca Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 01:05:29 +0200
Subject: [PATCH 04/11] added django 1.7.3 to build matrix (fixes #152)

---
 .travis.yml |  3 +++
 tox.ini     | 24 +++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa58aa0..d613163 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
   - DJANGO=Django==1.4.18 SOUTH=1
   - DJANGO=Django==1.5.12 SOUTH=1
   - DJANGO=Django==1.6.10 SOUTH=1
+  - DJANGO=Django==1.7.3 SOUTH=0
   - DJANGO=https://github.com/django/django/tarball/master SOUTH=1
 
 install:
@@ -25,6 +26,8 @@ matrix:
   exclude:
    - python: 2.6
      env: DJANGO=https://github.com/django/django/tarball/master SOUTH=1
+   - python: 2.6
+     env: DJANGO=Django==1.7.3 SOUTH=0
    - python: 3.2
      env: DJANGO=Django==1.4.18 SOUTH=1
    - python: 3.3
diff --git a/tox.ini b/tox.ini
index 0efa45f..9fd99cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py26-1.4, py26-1.5, py26-1.6,
-    py27-1.4, py27-1.5, py27-1.6, py27-trunk, py27-1.5-nosouth,
-    py32-1.5, py32-1.6, py32-trunk,
-    py33-1.5, py33-1.6, py33-trunk
+    py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-trunk, py27-1.5-nosouth,
+    py32-1.5, py32-1.6, py32-1.7, py32-trunk,
+    py33-1.5, py33-1.6, py33-1.7, py33-trunk
 
 [testenv]
 deps =
@@ -53,6 +53,12 @@ deps =
     South == 0.8.1
     coverage == 3.6
 
+[testenv:py27-1.7]
+basepython = python2.7
+deps =
+    Django == 1.7.3
+    coverage == 3.6
+
 [testenv:py27-trunk]
 basepython = python2.7
 deps =
@@ -80,6 +86,12 @@ deps =
     South == 0.8.1
     coverage == 3.6
 
+[testenv:py32-1.7]
+basepython = python3.2
+deps =
+    Django == 1.7.3
+    coverage == 3.6
+
 [testenv:py32-trunk]
 basepython = python3.2
 deps =
@@ -101,6 +113,12 @@ deps =
     South == 0.8.1
     coverage == 3.6
 
+[testenv:py33-1.7]
+basepython = python3.3
+deps =
+    Django == 1.7.3
+    coverage == 3.6
+
 [testenv:py33-trunk]
 basepython = python3.3
 deps =

From 271d3bfa275795ea32f94f4598c8d43caf57e10b Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 02:07:23 +0200
Subject: [PATCH 05/11] updated tox.ini to use generative envlist

---
 tox.ini | 136 +++++++-------------------------------------------------
 1 file changed, 16 insertions(+), 120 deletions(-)

diff --git a/tox.ini b/tox.ini
index 9fd99cb..ac68335 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,127 +1,23 @@
 [tox]
 envlist =
-    py26-1.4, py26-1.5, py26-1.6,
-    py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-trunk, py27-1.5-nosouth,
-    py32-1.5, py32-1.6, py32-1.7, py32-trunk,
-    py33-1.5, py33-1.6, py33-1.7, py33-trunk
+    py26-django{14,15,16},
+    py27-django14, py27-django15_nosouth,
+    py{27,32,33}-django{15,16,17,_trunk},
 
 [testenv]
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+
 deps =
-    South == 0.8.1
     coverage == 3.6
+    django14: Django==1.4.18
+    django15{,_nosouth}: Django==1.5.12
+    django16: Django==1.6.10
+    django17: Django==1.7.3
+    django_trunk: https://github.com/django/django/tarball/master
+    django{14,15,16}: South==1.0.2
+
 commands = coverage run -a setup.py test
-
-[testenv:py26-1.4]
-basepython = python2.6
-deps =
-    Django == 1.4.18
-    South == 0.7.6
-    coverage == 3.6
-
-[testenv:py26-1.5]
-basepython = python2.6
-deps =
-    Django == 1.5.5
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py26-1.6]
-basepython = python2.6
-deps =
-    https://github.com/django/django/tarball/stable/1.6.x
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.4]
-basepython = python2.7
-deps =
-    Django == 1.4.18
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.5]
-basepython = python2.7
-deps =
-    Django == 1.5.5
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.6]
-basepython = python2.7
-deps =
-    Django == 1.6.10
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.7]
-basepython = python2.7
-deps =
-    Django == 1.7.3
-    coverage == 3.6
-
-[testenv:py27-trunk]
-basepython = python2.7
-deps =
-    https://github.com/django/django/tarball/master
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.5-nosouth]
-basepython = python2.7
-deps =
-    Django == 1.5.12
-    coverage == 3.6
-
-[testenv:py32-1.5]
-basepython = python3.2
-deps =
-    Django == 1.5.12
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py32-1.6]
-basepython = python3.2
-deps =
-    Django == 1.6.10
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py32-1.7]
-basepython = python3.2
-deps =
-    Django == 1.7.3
-    coverage == 3.6
-
-[testenv:py32-trunk]
-basepython = python3.2
-deps =
-    https://github.com/django/django/tarball/master
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-1.5]
-basepython = python3.3
-deps =
-    Django == 1.5.12
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-1.6]
-basepython = python3.3
-deps =
-    Django == 1.6.10
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-1.7]
-basepython = python3.3
-deps =
-    Django == 1.7.3
-    coverage == 3.6
-
-[testenv:py33-trunk]
-basepython = python3.3
-deps =
-    https://github.com/django/django/tarball/master
-    South == 0.8.1
-    coverage == 3.6

From b03c7fd5b2b395279f811d291ee45fc9b8b2fc7b Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 03:54:54 +0200
Subject: [PATCH 06/11] travis-ci now runs tox

---
 .travis.yml           | 34 +++++++---------------------------
 update_travis_envs.sh | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100755 update_travis_envs.sh

diff --git a/.travis.yml b/.travis.yml
index d613163..6335409 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,19 @@
 language: python
 
-python:
-  - 2.6
-  - 2.7
-  - 3.2
-  - 3.3
+python: 2.7
 
 env:
-  - DJANGO=Django==1.4.18 SOUTH=1
-  - DJANGO=Django==1.5.12 SOUTH=1
-  - DJANGO=Django==1.6.10 SOUTH=1
-  - DJANGO=Django==1.7.3 SOUTH=0
-  - DJANGO=https://github.com/django/django/tarball/master SOUTH=1
 
 install:
-  - pip install $DJANGO
-  - pip install coverage coveralls
-  - sh -c "if [ '$SOUTH' = '1' ]; then pip install South==0.8.1; fi"
+  - pip install --upgrade pip setuptools tox virtualenv coveralls
 
 script:
-  - coverage run -a setup.py test
-  - coverage report
+  - tox
 
 matrix:
-  exclude:
-   - python: 2.6
-     env: DJANGO=https://github.com/django/django/tarball/master SOUTH=1
-   - python: 2.6
-     env: DJANGO=Django==1.7.3 SOUTH=0
-   - python: 3.2
-     env: DJANGO=Django==1.4.18 SOUTH=1
-   - python: 3.3
-     env: DJANGO=Django==1.4.18 SOUTH=1
-  include:
-   - python: 2.7
-     env: DJANGO=Django==1.5.12 SOUTH=0
+  allow_failures:
+    - env: TOXENV=py27-django_trunk
+    - env: TOXENV=py32-django_trunk
+    - env: TOXENV=py33-django_trunk
 
 after_success: coveralls
diff --git a/update_travis_envs.sh b/update_travis_envs.sh
new file mode 100755
index 0000000..e008c03
--- /dev/null
+++ b/update_travis_envs.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Updates .travis.yml envs based on tox.ini configuration.
+
+# Removing old environment list
+cp ./.travis.yml ./.travis.yml.bak
+cat ./.travis.yml.bak | grep -v "^  - TOXENV=" > ./.travis.yml
+
+# Inserting envs based on list generated by tox
+for env_name in $(tox --showconfig | grep testenv); do
+    env_name=${env_name#*:};
+    env_name=${env_name%]};
+    sed -i "/^env:$/a\
+\ \ - TOXENV=${env_name}" ./.travis.yml;
+done

From c460054180605129eff0f1eef9ddd82d20c1df97 Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 03:57:12 +0200
Subject: [PATCH 07/11] included tox envs into .travis.yml

---
 .travis.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6335409..9d55b2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,23 @@ language: python
 python: 2.7
 
 env:
+  - TOXENV=py33-django16
+  - TOXENV=py26-django16
+  - TOXENV=py26-django14
+  - TOXENV=py26-django15
+  - TOXENV=py32-django17
+  - TOXENV=py32-django16
+  - TOXENV=py32-django15
+  - TOXENV=py33-django17
+  - TOXENV=py33-django15
+  - TOXENV=py32-django_trunk
+  - TOXENV=py27-django17
+  - TOXENV=py27-django15
+  - TOXENV=py27-django15_nosouth
+  - TOXENV=py27-django14
+  - TOXENV=py27-django16
+  - TOXENV=py33-django_trunk
+  - TOXENV=py27-django_trunk
 
 install:
   - pip install --upgrade pip setuptools tox virtualenv coveralls

From 971ae30151803ad77f3d9b3936cf3b076770a3b7 Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 05:10:38 +0200
Subject: [PATCH 08/11] env list in .travis.yml will now be sorted

---
 .travis.yml           | 22 +++++++++++-----------
 update_travis_envs.sh |  4 +---
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9d55b2b..285f446 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,23 +3,23 @@ language: python
 python: 2.7
 
 env:
-  - TOXENV=py33-django16
-  - TOXENV=py26-django16
   - TOXENV=py26-django14
   - TOXENV=py26-django15
-  - TOXENV=py32-django17
-  - TOXENV=py32-django16
-  - TOXENV=py32-django15
-  - TOXENV=py33-django17
-  - TOXENV=py33-django15
-  - TOXENV=py32-django_trunk
-  - TOXENV=py27-django17
+  - TOXENV=py26-django16
+  - TOXENV=py27-django14
   - TOXENV=py27-django15
   - TOXENV=py27-django15_nosouth
-  - TOXENV=py27-django14
   - TOXENV=py27-django16
-  - TOXENV=py33-django_trunk
+  - TOXENV=py27-django17
   - TOXENV=py27-django_trunk
+  - TOXENV=py32-django15
+  - TOXENV=py32-django16
+  - TOXENV=py32-django17
+  - TOXENV=py32-django_trunk
+  - TOXENV=py33-django15
+  - TOXENV=py33-django16
+  - TOXENV=py33-django17
+  - TOXENV=py33-django_trunk
 
 install:
   - pip install --upgrade pip setuptools tox virtualenv coveralls
diff --git a/update_travis_envs.sh b/update_travis_envs.sh
index e008c03..8b5d559 100755
--- a/update_travis_envs.sh
+++ b/update_travis_envs.sh
@@ -7,9 +7,7 @@ cp ./.travis.yml ./.travis.yml.bak
 cat ./.travis.yml.bak | grep -v "^  - TOXENV=" > ./.travis.yml
 
 # Inserting envs based on list generated by tox
-for env_name in $(tox --showconfig | grep testenv); do
-    env_name=${env_name#*:};
-    env_name=${env_name%]};
+for env_name in $(tox --listenvs | sort -r); do
     sed -i "/^env:$/a\
 \ \ - TOXENV=${env_name}" ./.travis.yml;
 done

From 63ba203bda1abd9052809a9b75649aea1846f791 Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 05:12:47 +0200
Subject: [PATCH 09/11] added django 1.8 envs

---
 .travis.yml | 3 +++
 tox.ini     | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 285f446..5cff936 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,17 @@ env:
   - TOXENV=py27-django15_nosouth
   - TOXENV=py27-django16
   - TOXENV=py27-django17
+  - TOXENV=py27-django18
   - TOXENV=py27-django_trunk
   - TOXENV=py32-django15
   - TOXENV=py32-django16
   - TOXENV=py32-django17
+  - TOXENV=py32-django18
   - TOXENV=py32-django_trunk
   - TOXENV=py33-django15
   - TOXENV=py33-django16
   - TOXENV=py33-django17
+  - TOXENV=py33-django18
   - TOXENV=py33-django_trunk
 
 install:
diff --git a/tox.ini b/tox.ini
index ac68335..d22b9cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     py26-django{14,15,16},
     py27-django14, py27-django15_nosouth,
-    py{27,32,33}-django{15,16,17,_trunk},
+    py{27,32,33}-django{15,16,17,18,_trunk},
 
 [testenv]
 basepython =
@@ -17,6 +17,7 @@ deps =
     django15{,_nosouth}: Django==1.5.12
     django16: Django==1.6.10
     django17: Django==1.7.3
+    django18: Django==1.8a1
     django_trunk: https://github.com/django/django/tarball/master
     django{14,15,16}: South==1.0.2
 

From 0bb09b419cb0267cd57279ab9658aa673013f5fa Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 05:25:30 +0200
Subject: [PATCH 10/11] django 1.8 builds is allowed to fail

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5cff936..6076c58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,9 @@ script:
 
 matrix:
   allow_failures:
+    - env: TOXENV=py27-django18
+    - env: TOXENV=py32-django18
+    - env: TOXENV=py33-django18
     - env: TOXENV=py27-django_trunk
     - env: TOXENV=py32-django_trunk
     - env: TOXENV=py33-django_trunk

From 6944bdd218ebf2f6f57b7820ad5a4fe252bd552d Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuck <dmytro.kyrychuck@gmail.com>
Date: Tue, 27 Jan 2015 05:34:39 +0200
Subject: [PATCH 11/11] added python3.4 to env list

---
 .travis.yml | 5 +++++
 tox.ini     | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6076c58..cc17a3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,9 @@ env:
   - TOXENV=py33-django17
   - TOXENV=py33-django18
   - TOXENV=py33-django_trunk
+  - TOXENV=py34-django17
+  - TOXENV=py34-django18
+  - TOXENV=py34-django_trunk
 
 install:
   - pip install --upgrade pip setuptools tox virtualenv coveralls
@@ -35,8 +38,10 @@ matrix:
     - env: TOXENV=py27-django18
     - env: TOXENV=py32-django18
     - env: TOXENV=py33-django18
+    - env: TOXENV=py34-django18
     - env: TOXENV=py27-django_trunk
     - env: TOXENV=py32-django_trunk
     - env: TOXENV=py33-django_trunk
+    - env: TOXENV=py34-django_trunk
 
 after_success: coveralls
diff --git a/tox.ini b/tox.ini
index d22b9cf..5255cf5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist =
     py26-django{14,15,16},
     py27-django14, py27-django15_nosouth,
     py{27,32,33}-django{15,16,17,18,_trunk},
+    py34-django{17,18,_trunk},
 
 [testenv]
 basepython =
@@ -10,6 +11,7 @@ basepython =
     py27: python2.7
     py32: python3.2
     py33: python3.3
+    py34: python3.4
 
 deps =
     coverage == 3.6