From f033141cd56ff410b2edbfada644bfe615189a42 Mon Sep 17 00:00:00 2001
From: Jonas Haag <jonas@lophus.org>
Date: Tue, 29 Sep 2015 10:02:00 +0200
Subject: [PATCH 1/2] Simplify tox.ini, add more configurations to .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index a769642..dd5f4c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,26 +4,26 @@ python:
   - "2.7"
   - "3.2"
   - "3.3"
+  - "3.4"
 env:
-  - DJANGO=django==1.4.5
-  - DJANGO=django==1.5
-  - DJANGO=django==1.6
-  - DJANGO=django==1.7
-  - DJANGO=django==1.8
-  #- DJANGO=https://github.com/django/django/archive/stable/1.6.x.zip
+  - DJANGO=django>=1.4,<1.5
+  - DJANGO=django>=1.5,<1.6
+  - DJANGO=django>=1.6,<1.7
+  - DJANGO=django>=1.7,<1.8
+  - DJANGO=django>=1.8,<1.9
 
 matrix:
   exclude:
+  - python: "3.4"
+    env: DJANGO=django>=1.4,<1.5
   - python: "3.3"
-    env: DJANGO=django==1.4.5
+    env: DJANGO=django>=1.4,<1.5
   - python: "3.2"
-    env: DJANGO=django==1.4.5
+    env: DJANGO=django>=1.4,<1.5
   - python: "2.6"
-    env: DJANGO=django==1.7
+    env: DJANGO=django>=1.7,<1.8
   - python: "2.6"
-    env: DJANGO=django==1.8
-  - python: "2.6"
-    env: DJANGO=https://www.djangoproject.com/download/1.8a1/tarball/
+    env: DJANGO=django>=1.8,<1.9
 
 install:
   - pip install $DJANGO coverage==3.6
diff --git a/tox.ini b/tox.ini
index 014fa21..a40ff2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,119 +1,24 @@
 [tox]
 envlist=
-    py26-django14,
-    py26-django15,
-    py26-django16,
-
-    py27-django14,
-    py27-django15,
-    py27-django16,
-    py27-django17,
-    py27-django18,
-
-    py32-django15,
-    py32-django16,
-    py32-django17,
-    py32-django18,
-
-    py33-django15,
-    py33-django16,
-    py33-django17,
-    py33-django18,
-
-    py33-django-dev,
+    py26-django{14,15,16},
+    py27-django{14,15,16,17,18},
+    py32-django{14,15,16,17,18},
+    py33-django{14,15,16,17,18},
+    py34-django{14,15,16,17,18},
     docs,
 
 [testenv]
+deps =
+    django14: Django >= 1.4, < 1.5
+    django15: Django >= 1.5, < 1.6
+    django16: Django >= 1.6, < 1.7
+    django17: Django >= 1.7, < 1.8
+    django18: Django >= 1.8, < 1.9
+    django19: Django >= 1.9a1, < 1.10
+    django-dev: https://github.com/django/django/tarball/master
 commands=
     python runtests.py
 
-# Build configurations
-
-[testenv:py26-django14]
-basepython=python2.6
-deps=
-    django==1.4.5
-
-[testenv:py26-django15]
-basepython=python2.6
-deps=
-    django==1.5
-
-[testenv:py26-django16]
-basepython=python2.6
-deps=
-    django==1.6
-
-[testenv:py27-django14]
-basepython=python2.7
-deps=
-    django==1.4.5
-
-[testenv:py27-django15]
-basepython=python2.7
-deps=
-    django==1.5
-
-[testenv:py27-django16]
-basepython=python2.7
-deps=
-    django==1.6
-
-[testenv:py27-django17]
-basepython=python2.7
-deps=
-    django==1.7
-
-[testenv:py27-django18]
-basepython=python2.7
-deps=
-    django==1.8
-
-[testenv:py32-django15]
-basepython=python3.2
-deps=
-    django==1.5
-
-[testenv:py32-django16]
-basepython=python3.2
-deps=
-    django==1.6
-
-[testenv:py32-django17]
-basepython=python3.2
-deps=
-    django==1.7
-
-[testenv:py32-django18]
-basepython=python3.2
-deps=
-    django==1.8
-
-[testenv:py33-django15]
-basepython=python3.3
-deps=
-    django==1.5
-
-[testenv:py33-django16]
-basepython=python3.3
-deps=
-    django==1.6
-
-[testenv:py33-django17]
-basepython=python3.3
-deps=
-    django==1.7
-
-[testenv:py33-django18]
-basepython=python3.3
-deps=
-    django==1.8
-
-[testenv:py33-django-dev]
-basepython=python3.3
-deps=
-    https://github.com/django/django/archive/master.zip
-
 [testenv:docs]
 changedir=docs
 deps=Sphinx

From bcb6e80ee6f73236c4556f9d825d739890aa88fc Mon Sep 17 00:00:00 2001
From: Jonas Haag <jonas@lophus.org>
Date: Tue, 29 Sep 2015 10:07:08 +0200
Subject: [PATCH 2/2] Fix .travis.yml syntax

---
 .travis.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd5f4c8..5553c32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,27 +6,27 @@ python:
   - "3.3"
   - "3.4"
 env:
-  - DJANGO=django>=1.4,<1.5
-  - DJANGO=django>=1.5,<1.6
-  - DJANGO=django>=1.6,<1.7
-  - DJANGO=django>=1.7,<1.8
-  - DJANGO=django>=1.8,<1.9
+  - DJANGO=">=1.4,<1.5"
+  - DJANGO=">=1.5,<1.6"
+  - DJANGO=">=1.6,<1.7"
+  - DJANGO=">=1.7,<1.8"
+  - DJANGO=">=1.8,<1.9"
 
 matrix:
   exclude:
   - python: "3.4"
-    env: DJANGO=django>=1.4,<1.5
+    env: DJANGO=">=1.4,<1.5"
   - python: "3.3"
-    env: DJANGO=django>=1.4,<1.5
+    env: DJANGO=">=1.4,<1.5"
   - python: "3.2"
-    env: DJANGO=django>=1.4,<1.5
+    env: DJANGO=">=1.4,<1.5"
   - python: "2.6"
-    env: DJANGO=django>=1.7,<1.8
+    env: DJANGO=">=1.7,<1.8"
   - python: "2.6"
-    env: DJANGO=django>=1.8,<1.9
+    env: DJANGO=">=1.8,<1.9"
 
 install:
-  - pip install $DJANGO coverage==3.6
+  - pip install django$DJANGO coverage==3.6
 
 script:
   - coverage run --source=polymorphic runtests.py