From e207b962eb91634ee83bfafdb4641af756d6c898 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Fri, 27 Mar 2015 09:28:27 +0000
Subject: [PATCH] Add MySQL to tox/travis

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

diff --git a/.travis.yml b/.travis.yml
index c41b47079..ae28d9a4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,17 +8,19 @@ matrix:
    - env: TOXENV=py33-dj17-postgres
    - env: TOXENV=py34-dj17-postgres
    - env: TOXENV=py34-dj17-sqlite
+   - env: TOXENV=py34-dj17-mysql
    - env: TOXENV=py27-dj18-postgres
 #   - env: TOXENV=py27-dj18-mysql
 #   - env: TOXENV=py27-dj18-sqlite
 #  - env: TOXENV=py33-dj18-postgres
    - env: TOXENV=py34-dj18-postgres
    - env: TOXENV=py34-dj18-sqlite
+   - env: TOXENV=py34-dj18-mysql
   allow_failures:
-   - env: TOXENV=py27-dj17-mysql
    - env: TOXENV=py27-dj18-postgres
    - env: TOXENV=py34-dj18-postgres
    - env: TOXENV=py34-dj18-sqlite
+   - env: TOXENV=py34-dj18-mysql
 
 # Services
 services:
diff --git a/tox.ini b/tox.ini
index d37b20772..fe2092605 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,6 +43,7 @@ envlist =
     py33-dj17-postgres,
     py33-dj17-sqlite,
     py34-dj17-postgres,
+    py34-dj17-mysql,
     py34-dj17-sqlite,
     py27-dj18-postgres,
     py27-dj18-sqlite,
@@ -51,6 +52,7 @@ envlist =
     py33-dj18-sqlite,
     py34-dj18-postgres,
     py34-dj18-sqlite
+    py34-dj18-mysql,
 
 
 [testenv]
@@ -82,7 +84,7 @@ deps =
     {[deps]base}
     {[deps]py2}
     {[deps]dj17}
-    MySQL-python==1.2.5
+    mysqlclient==1.3.6
 setenv =
     DATABASE_ENGINE=django.db.backends.mysql
     DATABASE_USER=wagtail
@@ -127,6 +129,19 @@ deps =
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
 
+[testenv:py34-dj17-mysql]
+basepython=python3.4
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj17}
+    mysqlclient==1.3.6
+setenv =
+    DATABASE_ENGINE=django.db.backends.mysql
+    DATABASE_USER=wagtail
+    DATABASE_HOST=localhost
+    DATABASE_USER=root
+
 
 [testenv:py27-dj18-postgres]
 basepython=python2.7
@@ -153,7 +168,7 @@ deps =
     {[deps]base}
     {[deps]py2}
     {[deps]dj18}
-    MySQL-python==1.2.5
+    mysqlclient==1.3.6
 setenv =
     DATABASE_ENGINE=django.db.backends.mysql
     DATABASE_USER=wagtail
@@ -197,3 +212,16 @@ deps =
     {[deps]dj18}
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
+
+[testenv:py34-dj18-mysql]
+basepython=python3.4
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj18}
+    mysqlclient==1.3.6
+setenv =
+    DATABASE_ENGINE=django.db.backends.mysql
+    DATABASE_USER=wagtail
+    DATABASE_HOST=localhost
+    DATABASE_USER=root