Permalink
Browse files

Use tox for running tests

  • Loading branch information...
mattupstate committed Dec 19, 2013
1 parent c302fb8 commit 06ce1c68fd5e6b7f578e106331c7c686a9e2ed48
Showing with 3 additions and 6 deletions.
  1. +2 −5 .travis.yml
  2. +1 −1 tox.ini
View
@@ -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:
View
@@ -8,6 +8,6 @@ deps =
Flask-SQLAlchemy
Flask-MongoEngine
Flask-Peewee
- py-bcrypt
+ bcrypt
commands = nosetests []

0 comments on commit 06ce1c6

Please sign in to comment.