Adding mysql-connector dependency to tox for supported python3 versions

- Also pulling before_install into a separate script so it's more
  readable
- Using mysql-connector for mysql tests in python3 on Travis-CI

Author: mwatts15

.travis.yml

@@ -20,13 +20,7 @@ install:
 - pip install -U setuptools tox tox-travis
 
 before_script:
-- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS test;' -U postgres;
-  psql -c 'create database test;' -U postgres; export DBURI='postgresql+psycopg2://postgres@localhost/test';
-  fi"
-- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE SCHEMA test DEFAULT CHARACTER SET utf8;';
-  export DBURI='mysql+mysqldb://test@localhost/test?charset=utf8'; fi"
-- sh -c "if [ '$DB' = 'sqlite' ]; then export DBURI='sqlite:///%(here)s/test.sqlite';
-  fi"
+- ./travis-ci.sh
 
 script: tox
 

tox.ini

@@ -10,6 +10,7 @@ commands =
 deps =
     psycopg2
     mysqlclient
+    py{34,35,36,37}: mysql-connector
 
 [testenv:lint]
 commands = flake8 rdflib_sqlalchemy test
@@ -27,9 +28,10 @@ deps =
     psycopg2
     mysqlclient
 
-[tox:travis]
-2.7 = py27, cover, lint
-3.5 = py35, lint
+[travis]
+python =
+    2.7: py27, cover, lint
+    3.5: py35, lint
 
 [flake8]
 max-line-length = 120

travis-ci.sh

@@ -0,0 +1,20 @@
+#!/bin/bash -ex
+
+if [ "$DB" = 'pgsql' ]; then
+    psql -c 'DROP DATABASE IF EXISTS test;' -U postgres
+    psql -c 'create database test;' -U postgres
+    export DBURI='postgresql+psycopg2://postgres@localhost/test'
+fi
+
+if [ "$DB" = 'mysql' ]; then
+    mysql -e 'CREATE SCHEMA test DEFAULT CHARACTER SET utf8;'
+    if [[ "$TRAVIS_PYTHON_VERSION" =~ '.*3\.[4567].*' ]] ; then
+        export DBURI='mysql+mysqlconnector://test@localhost/test?charset=utf8'
+    else
+        export DBURI='mysql+mysqldb://test@localhost/test?charset=utf8'
+    fi
+fi
+
+if [ "$DB" = 'sqlite' ]; then
+    export DBURI='sqlite:///%(here)s/test.sqlite'
+fi