From 13422e046fc80d5cad35901f813819e73eb3cdf3 Mon Sep 17 00:00:00 2001 From: Matt Wright Date: Tue, 3 Sep 2013 13:00:03 -0400 Subject: [PATCH] Use bcrypt instead of py-bcrypt --- .travis.yml | 2 +- tox.ini | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 tox.ini diff --git a/.travis.yml b/.travis.yml index dd84116..c933e3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ 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 + - pip install nose simplejson Flask-SQLAlchemy Flask-MongoEngine Flask-Peewee bcrypt MySQL-python --quiet before_script: - mysql -e 'create database flask_security_test;' diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..9746aea --- /dev/null +++ b/tox.ini @@ -0,0 +1,13 @@ +[tox] +envlist = py26, py27, pypy + +[testenv] +deps = + nose + simplejson + Flask-SQLAlchemy + Flask-MongoEngine + Flask-Peewee + bcrypt + +commands = nosetests []