From cbbdce4ed2520db5e9b3e4fc89fb3f966c61c967 Mon Sep 17 00:00:00 2001
From: Bertrand Bordage <bordage.bertrand@gmail.com>
Date: Mon, 16 Feb 2015 17:25:21 +0100
Subject: [PATCH] Removes Django 1.8 alpha from the test matrix.

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

diff --git a/.travis.yml b/.travis.yml
index 5d8b934..ffc60f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,33 +17,18 @@ env:
   - TOXENV=py2.7-django1.7-sqlite3-pylibmc
   - TOXENV=py2.7-django1.7-postgresql-pylibmc
   - TOXENV=py2.7-django1.7-mysql-pylibmc
-  - TOXENV=py2.7-django1.8-sqlite3-pylibmc
-  - TOXENV=py2.7-django1.8-postgresql-pylibmc
-  - TOXENV=py2.7-django1.8-mysql-pylibmc
   - TOXENV=py2.7-django1.7-sqlite3-filebased
   - TOXENV=py2.7-django1.7-postgresql-filebased
   - TOXENV=py2.7-django1.7-mysql-filebased
-  - TOXENV=py2.7-django1.8-sqlite3-filebased
-  - TOXENV=py2.7-django1.8-postgresql-filebased
-  - TOXENV=py2.7-django1.8-mysql-filebased
   - TOXENV=py3.2-django1.7-sqlite3-filebased
   - TOXENV=py3.2-django1.7-postgresql-filebased
   - TOXENV=py3.2-django1.7-mysql-filebased
-  - TOXENV=py3.2-django1.8-sqlite3-filebased
-  - TOXENV=py3.2-django1.8-postgresql-filebased
-  - TOXENV=py3.2-django1.8-mysql-filebased
   - TOXENV=py3.3-django1.7-sqlite3-filebased
   - TOXENV=py3.3-django1.7-postgresql-filebased
   - TOXENV=py3.3-django1.7-mysql-filebased
-  - TOXENV=py3.3-django1.8-sqlite3-filebased
-  - TOXENV=py3.3-django1.8-postgresql-filebased
-  - TOXENV=py3.3-django1.8-mysql-filebased
   - TOXENV=py3.4-django1.7-sqlite3-filebased
   - TOXENV=py3.4-django1.7-postgresql-filebased
   - TOXENV=py3.4-django1.7-mysql-filebased
-  - TOXENV=py3.4-django1.8-sqlite3-filebased
-  - TOXENV=py3.4-django1.8-postgresql-filebased
-  - TOXENV=py3.4-django1.8-mysql-filebased
   - TOXENV=py2.7-django1.6-sqlite3-locmem
   - TOXENV=py2.7-django1.6-sqlite3-redis
   - TOXENV=py2.7-django1.6-sqlite3-memcached
@@ -62,15 +47,6 @@ env:
   - TOXENV=py2.7-django1.7-mysql-locmem
   - TOXENV=py2.7-django1.7-mysql-redis
   - TOXENV=py2.7-django1.7-mysql-memcached
-  - TOXENV=py2.7-django1.8-sqlite3-locmem
-  - TOXENV=py2.7-django1.8-sqlite3-redis
-  - TOXENV=py2.7-django1.8-sqlite3-memcached
-  - TOXENV=py2.7-django1.8-postgresql-locmem
-  - TOXENV=py2.7-django1.8-postgresql-redis
-  - TOXENV=py2.7-django1.8-postgresql-memcached
-  - TOXENV=py2.7-django1.8-mysql-locmem
-  - TOXENV=py2.7-django1.8-mysql-redis
-  - TOXENV=py2.7-django1.8-mysql-memcached
   - TOXENV=py3.2-django1.6-sqlite3-locmem
   - TOXENV=py3.2-django1.6-sqlite3-redis
   - TOXENV=py3.2-django1.6-sqlite3-memcached
@@ -89,15 +65,6 @@ env:
   - TOXENV=py3.2-django1.7-mysql-locmem
   - TOXENV=py3.2-django1.7-mysql-redis
   - TOXENV=py3.2-django1.7-mysql-memcached
-  - TOXENV=py3.2-django1.8-sqlite3-locmem
-  - TOXENV=py3.2-django1.8-sqlite3-redis
-  - TOXENV=py3.2-django1.8-sqlite3-memcached
-  - TOXENV=py3.2-django1.8-postgresql-locmem
-  - TOXENV=py3.2-django1.8-postgresql-redis
-  - TOXENV=py3.2-django1.8-postgresql-memcached
-  - TOXENV=py3.2-django1.8-mysql-locmem
-  - TOXENV=py3.2-django1.8-mysql-redis
-  - TOXENV=py3.2-django1.8-mysql-memcached
   - TOXENV=py3.3-django1.6-sqlite3-locmem
   - TOXENV=py3.3-django1.6-sqlite3-redis
   - TOXENV=py3.3-django1.6-sqlite3-memcached
@@ -116,15 +83,6 @@ env:
   - TOXENV=py3.3-django1.7-mysql-locmem
   - TOXENV=py3.3-django1.7-mysql-redis
   - TOXENV=py3.3-django1.7-mysql-memcached
-  - TOXENV=py3.3-django1.8-sqlite3-locmem
-  - TOXENV=py3.3-django1.8-sqlite3-redis
-  - TOXENV=py3.3-django1.8-sqlite3-memcached
-  - TOXENV=py3.3-django1.8-postgresql-locmem
-  - TOXENV=py3.3-django1.8-postgresql-redis
-  - TOXENV=py3.3-django1.8-postgresql-memcached
-  - TOXENV=py3.3-django1.8-mysql-locmem
-  - TOXENV=py3.3-django1.8-mysql-redis
-  - TOXENV=py3.3-django1.8-mysql-memcached
   - TOXENV=py3.4-django1.6-sqlite3-locmem
   - TOXENV=py3.4-django1.6-sqlite3-redis
   - TOXENV=py3.4-django1.6-sqlite3-memcached
@@ -143,15 +101,6 @@ env:
   - TOXENV=py3.4-django1.7-mysql-locmem
   - TOXENV=py3.4-django1.7-mysql-redis
   - TOXENV=py3.4-django1.7-mysql-memcached
-  - TOXENV=py3.4-django1.8-sqlite3-locmem
-  - TOXENV=py3.4-django1.8-sqlite3-redis
-  - TOXENV=py3.4-django1.8-sqlite3-memcached
-  - TOXENV=py3.4-django1.8-postgresql-locmem
-  - TOXENV=py3.4-django1.8-postgresql-redis
-  - TOXENV=py3.4-django1.8-postgresql-memcached
-  - TOXENV=py3.4-django1.8-mysql-locmem
-  - TOXENV=py3.4-django1.8-mysql-redis
-  - TOXENV=py3.4-django1.8-mysql-memcached
 
 sudo: false
 
diff --git a/tox.ini b/tox.ini
index 6753742..ac8c51a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py2.6-django1.6-{sqlite3,postgresql,mysql}-{locmem,redis,memcached},
-    py2.7-django{1.7,1.8}-{sqlite3,postgresql,mysql}-pylibmc,
-    py{2.7,3.2,3.3,3.4}-django{1.7,1.8}-{sqlite3,postgresql,mysql}-filebased,
-    py{2.7,3.2,3.3,3.4}-django{1.6,1.7,1.8}-{sqlite3,postgresql,mysql}-{locmem,redis,memcached},
+    py2.7-django1.7-{sqlite3,postgresql,mysql}-pylibmc,
+    py{2.7,3.2,3.3,3.4}-django1.7-{sqlite3,postgresql,mysql}-filebased,
+    py{2.7,3.2,3.3,3.4}-django{1.6,1.7}-{sqlite3,postgresql,mysql}-{locmem,redis,memcached},
 
 [testenv]
 basepython =
@@ -16,7 +16,6 @@ deps =
     coverage
     django1.6: Django>=1.6,<1.7
     django1.7: Django>=1.7,<1.8
-    django1.8: Django==1.8a1
     South
     psycopg2
     django-redis