Merge "Fix temporary pypy gate issue with setuptools"

2014-03-21 00:51:13 +00:00 · 2014-03-21 00:51:13 +00:00 · 6be5c8cd77
commit 6be5c8cd77
parent 8ff7d56037 7730a5d599
1 changed files with 5 additions and 0 deletions
--- a/tox.ini
+++ b/tox.ini
@ -12,6 +12,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 bin/swift swiftclient tests