From 70d322724dcd1b28517dcc5e5e8b879d66e77652 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Wed, 25 Sep 2013 00:17:04 +0900
Subject: [PATCH] Use tox on travis.

---
 .travis.yml | 14 +++++---------
 tox.ini     |  8 ++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index 297737a..d8ea48c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,18 @@
 language: python
-
-python:
-    - "2.6"
-    - "2.7"
-    - "3.3"
-    - "pypy"
+python: "2.7"
 
 before_install:
+    - sudo add-apt-repository -y ppa:pypy/ppa
     - sudo apt-get update -qq -y
     - sudo apt-get -y dist-upgrade
+    - sudo apt-get -y install pypy
 
 install:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi
-    - python setup.py develop
+    - pip install -M tox
 
 before_script:
     - "mysql -e 'create database test_pymysql  DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
     - "mysql -e 'create database test_pymysql2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
     - cp .travis.databases.json pymysql/tests/databases.json
 
-script: ./runtests.py
+script: tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..09eef03
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py26,py27,py33,pypy
+
+[testenv]
+commands = ./runtests.py
+
+[testenv:py26]
+deps = unittest2