summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-14 15:12:38 +0000
committerGerrit Code Review <review@openstack.org>2013-06-14 15:12:38 +0000
commit12bc22b07aa3d5c5a966e44f53836dbf449e63dd (patch)
treee9e4efefaac844cab7cfd7f77be3e9debce39a5e
parent0edcf764bde3e77de1ef9c66d8be88d5bc180dce (diff)
parent5ac0b450299c32f7794a022ba8f7753dabae8613 (diff)
downloadpython-neutronclient-12bc22b07aa3d5c5a966e44f53836dbf449e63dd.tar.gz
Merge "update to latest pbr & remove distribute from tox"2.2.2a12.2.2
-rw-r--r--requirements.txt4
-rw-r--r--tox.ini1
2 files changed, 3 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index b1acf18..1eabc6f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
d2to1>=0.2.10,<0.3
-pbr>=0.5.10,<0.6
+pbr>=0.5.16,<0.6
argparse
-cliff>=1.3.2
+cliff>=1.4
httplib2
iso8601
prettytable>=0.6,<0.8
diff --git a/tox.ini b/tox.ini
index 61a839c..fb9729e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ commands = python setup.py testr --testr-args='{posargs}'
[testenv:pep8]
commands = flake8
+distribute = false
[testenv:venv]
commands = {posargs}