Merge "Work around pypy testing issue"

2014-03-21 08:18:54 +00:00
parent fdb85fd595 27d238d295
commit debd91bb4a
1 changed files with 5 additions and 0 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,11 @@ deps = -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'

+[testenv:pypy]
+deps = setuptools<3.2
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 commands = flake8
 distribute = false