From 7098a6757c5b3e6bfad8743e339f868a0d73a4fe Mon Sep 17 00:00:00 2001
From: Matt Wright <matt@nobien.net>
Date: Fri, 14 Mar 2014 15:30:30 -0400
Subject: [PATCH] Update build files

---
 .travis.yml | 8 ++++----
 setup.cfg   | 3 +++
 tox.ini     | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9014dc3..558e09b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,14 @@ python:
   - "pypy"
 
 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 bcrypt coverage coveralls --quiet
+  - pip install -r requirements.txt -r requirements-dev.txt -e .
+  - pip install coverage coveralls
+  - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install importlib; fi"
 
 services:
   - mongodb
 
-script: nosetests --with-coverage --cover-package flask_security
+script: py.test --cov flask_security --cov-report term-missing --pep8 --flakes
 
 after_script:
   - coveralls
diff --git a/setup.cfg b/setup.cfg
index fe56265..423c98b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,7 +10,10 @@ pep8maxlinelength = 99
 
 pep8ignore =
     docs/* ALL
+    scripts/* ALL
 
 flakes-ignore =
     ImportStarUsed
     flask_security/__init__.py UnusedImport
+    docs/* ALL
+    scripts/* ALL
diff --git a/tox.ini b/tox.ini
index c89e171..341e949 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist = py26, py27, py33, pypy
 
 [testenv]
 deps =
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements-dev.txt
 
 commands =