From eb52e76fd5ea1bbd27efad60556f17a630e588c0 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 17 Mar 2014 18:45:36 -0400 Subject: [PATCH] workaround pypy in requirements pypy is blocking all requirements merge at the moment, which is problematic as we've got some changes that should land prior to icehouse. Implement the work around that fungi posted to IRC. Related-Bug: #1290562 Change-Id: I973e71f96903f687c1e3b6c00db93949d5b88d2f --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index 37966d52f9..f2f91c36f0 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,11 @@ deps = -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' +# work around until pypy vs. setuptools issue in bug 1290562 is fixed +[testenv:pypy] +deps = setuptools<3.2 + -r{toxinidir}/test-requirements.txt + [testenv:pep8] commands = flake8