From 06ce1c68fd5e6b7f578e106331c7c686a9e2ed48 Mon Sep 17 00:00:00 2001
From: Matt Wright <matt@nobien.net>
Date: Thu, 19 Dec 2013 15:10:20 -0500
Subject: [PATCH] Use tox for running tests

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

diff --git a/.travis.yml b/.travis.yml
index 6fae2be..c6eccd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,12 @@ python:
 install:
   - pip install . --quiet
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install importlib --quiet --use-mirrors; fi"
-  - pip install nose simplejson Flask-SQLAlchemy Flask-MongoEngine Flask-Peewee py-bcrypt MySQL-python --quiet
-
-before_script:
-  - mysql -e 'create database flask_security_test;'
+  - pip install tox simplejson Flask-SQLAlchemy Flask-MongoEngine Flask-Peewee bcrypt --quiet
 
 services:
   - mongodb
 
-script: nosetests
+script: tox
 
 branches:
   only:
diff --git a/tox.ini b/tox.ini
index 411086c..02e47ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,6 @@ deps =
     Flask-SQLAlchemy
     Flask-MongoEngine
     Flask-Peewee
-    py-bcrypt
+    bcrypt
 
 commands = nosetests []