summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-21 00:51:13 +0000
committerGerrit Code Review <review@openstack.org>2014-03-21 00:51:13 +0000
commit6be5c8cd77cbcc3c667f2c2a36eb1013497e8a36 (patch)
tree23ed6738be0af9883064e677f5045121cd72c54e
parent8ff7d56037a002f442e024416062c75c34dc0759 (diff)
parent7730a5d5996b845d5cbeb736011081d9c2c23600 (diff)
downloadpython-swiftclient-6be5c8cd77cbcc3c667f2c2a36eb1013497e8a36.tar.gz
Merge "Fix temporary pypy gate issue with setuptools"
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 793bf5d..3226f30 100644
--- 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