Merge "Remove workaround for pypy"

2015-09-23 20:50:57 +00:00 · 2015-09-23 20:50:57 +00:00 · 8bb7572806
commit 8bb7572806
parent cf16dd9414 e0674e56ec
1 changed files with 0 additions and 5 deletions
--- a/tox.ini
+++ b/tox.ini
@ -23,11 +23,6 @@ commands = generate-constraints {posargs}
 [testenv:validate]
 commands = validate-constraints {toxinidir}/global-requirements.txt {toxinidir}/upper-constraints.txt {toxinidir}/blacklist.txt

-# work around until pypy vs. setuptools issue in bug 1290562 is fixed
-[testenv:pypy]
-deps = setuptools>3.4
-     -r{toxinidir}/test-requirements.txt
-
 [testenv:pep8]
 commands = flake8