summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2013-12-28 10:55:49 -0500
committerEli Collins <elic@assurancetechnologies.com>2013-12-28 10:55:49 -0500
commit6b80772c50ef1d7656cbb34f971648ddd0c4f749 (patch)
treedd84a357735538be5bcaeae4f7abf6b9e42c8068 /tox.ini
parent97216e14e96d5e8414946be29fe5f50673124d65 (diff)
downloadpasslib-6b80772c50ef1d7656cbb34f971648ddd0c4f749.tar.gz
test_ext_django: fix spurious error if django 1.6 installed but not bcrypt; added tox case to catch it also
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 8 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 81652e6..e52df3b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,7 +46,7 @@
#===========================================================================
[tox]
minversion=1.4
-envlist = py27,py33,py26,py31,py32,pypy,pypy3,py-bcrypt,py-bcrypt-py3,django12,django13,django14,django15,django,django-py3,gae27
+envlist = py27,py33,py26,py31,py32,pypy,pypy3,py-bcrypt,py-bcrypt-py3,django12,django13,django14,django15,django,django-wo-bcrypt,django-py3,gae27
#===========================================================================
# stock CPython VMs
@@ -158,6 +158,13 @@ deps =
commands =
nosetests {posargs:passlib.tests.test_ext_django passlib.tests.test_handlers_django}
+[testenv:django-wo-bcrypt]
+deps =
+ django
+ {[testenv]deps}
+commands =
+ nosetests {posargs:passlib.tests.test_ext_django passlib.tests.test_handlers_django}
+
[testenv:django-py3]
# NOTE: including bcrypt so django bcrypt hasher is included
basepython = python3