From ab2f2e14f6259563045aaa4fec2444488e0209b0 Mon Sep 17 00:00:00 2001
From: Dirk Eschler <eschler@gmail.com>
Date: Thu, 13 Apr 2017 13:38:02 +0200
Subject: [PATCH] Don't exclude mysql for Python3 anymore, install mysqlclient
 instead. Set proper excludes for Python 3.3 and 3.6.

---
 .travis.yml | 57 ++++++++++++++++++++++-------------------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23f7906..7651ee0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,55 +20,45 @@ env:
   - DJANGO=1.11 DB=mysql
 matrix:
   exclude:
+    - python: "3.6"
+      env: DJANGO=1.8 DB=sqlite
+    - python: "3.6"
+      env: DJANGO=1.8 DB=mysql
+    - python: "3.6"
+      env: DJANGO=1.8 DB=postgres
+
     - python: "3.3"
       env: DJANGO=1.9 DB=sqlite
-    - python: "3.3"
-      env: DJANGO=1.9 DB=postgres
     - python: "3.3"
       env: DJANGO=1.9 DB=mysql
+    - python: "3.3"
+      env: DJANGO=1.9 DB=postgres
+    - python: "3.6"
+      env: DJANGO=1.9 DB=sqlite
+    - python: "3.6"
+      env: DJANGO=1.9 DB=mysql
+    - python: "3.6"
+      env: DJANGO=1.9 DB=postgres
+
     - python: "3.3"
       env: DJANGO=1.10 DB=sqlite
     - python: "3.3"
       env: DJANGO=1.10 DB=postgres
     - python: "3.3"
       env: DJANGO=1.10 DB=mysql
+    - python: "3.6"
+      env: DJANGO=1.10 DB=sqlite
+    - python: "3.6"
+      env: DJANGO=1.10 DB=postgres
+    - python: "3.6"
+      env: DJANGO=1.10 DB=mysql
+
     - python: "3.3"
       env: DJANGO=1.11 DB=sqlite
     - python: "3.3"
       env: DJANGO=1.11 DB=postgres
     - python: "3.3"
       env: DJANGO=1.11 DB=mysql
-
-    - python: "3.3"
-      env: DJANGO=1.8 DB=mysql
-    - python: "3.4"
-      env: DJANGO=1.8 DB=mysql
-    - python: "3.5"
-      env: DJANGO=1.8 DB=mysql
-    - python: "3.2"
-      env: DJANGO=1.9 DB=mysql
-    - python: "3.3"
-      env: DJANGO=1.9 DB=mysql
-    - python: "3.4"
-      env: DJANGO=1.9 DB=mysql
-    - python: "3.5"
-      env: DJANGO=1.9 DB=mysql
-    - python: "3.6"
-      env: DJANGO=1.9 DB=mysql
-    - python: "3.3"
-      env: DJANGO=1.10 DB=mysql
-    - python: "3.4"
-      env: DJANGO=1.10 DB=mysql
-    - python: "3.5"
-      env: DJANGO=1.10 DB=mysql
-    - python: "3.6"
-      env: DJANGO=1.10 DB=mysql
-    - python: "3.3"
-      env: DJANGO=1.11 DB=mysql
-    - python: "3.4"
-      env: DJANGO=1.11 DB=mysql
-    - python: "3.5"
-      env: DJANGO=1.11 DB=mysql
 before_install:
   - pip install -q 'flake8<3'
   - PYFLAKES_NODOCTEST=1 flake8 modeltranslation
@@ -77,6 +67,7 @@ before_script:
   - psql -c 'create database modeltranslation;' -U postgres
 install:
   - if [[ $DB == mysql ]]; then pip install -q mysql-python; fi
+  - if [[ $DB == mysql ]] && [[ ${PYTHON:0:1} == "2" ]]; then echo "mysql-python"; elif [[ $DB == mysql ]] && [[ ${PYTHON:0:1} == "3" ]]; then echo "mysqlclient"; fi
   - if [[ $DB == postgres ]]; then pip install -q psycopg2; fi
   - pip install -q Pillow
   - IDJANGO=$(./travis.py $DJANGO)