From 69ca1a51b756757b23bdd84de9bd5d0d0b7a5023 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Fri, 20 May 2016 17:53:08 +0200
Subject: [PATCH] Fixed targetting Django 1.10 in test config files

Simply writing Django<1.11.0 may run with an older pre-installed Django.
---
 .travis.yml | 10 +++++-----
 tox.ini     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e7db0086..acc6c5508 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
 env:
   - DJANGO="Django>=1.8.0,<1.9.0"
   - DJANGO="Django>=1.9.0,<1.10.0"
-  - DJANGO="Django<1.11.0"
+  - DJANGO="Django>=1.10a,<1.11.0"
 matrix:
   exclude:
     - python: "3.2"
@@ -17,15 +17,15 @@ matrix:
     - python: "3.3"
       env: DJANGO="Django>=1.9.0,<1.10.0"
     - python: "3.2"
-      env: DJANGO="Django<1.11.0"
+      env: DJANGO="Django>=1.10a,<1.11.0"
     - python: "3.3"
-      env: DJANGO="Django<1.11.0"
+      env: DJANGO="Django>=1.10a,<1.11.0"
     - python: "3.5"
       env: DJANGO="Django>=1.8.0,<1.9.0"
 install:
-  - pip install -e .
-  - travis_retry pip install django-discover-runner sqlparse
+  - travis_retry pip install sqlparse
   - travis_retry pip install --pre $DJANGO
+  - pip install -e .
 script:
   - make jshint
   - make test
diff --git a/tox.ini b/tox.ini
index 8491cc871..90a0dd0d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,13 +16,13 @@ commands = make test
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
-    django110: Django<1.11
-    django-discover-runner
+    django110: Django>=1.10a,<1.11
     selenium
     sqlparse
 setenv =
     PYTHONPATH = {toxinidir}
 whitelist_externals = make
+pip_pre=True
 
 [testenv:flake8]
 basepython =