From e9dba9d4cd2c9bc03ff538a993c3fb93671223e1 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 6 Feb 2015 22:17:09 -0500 Subject: [PATCH] Keep up with the global requirements docker-py and python-kubernetes are the only ones not in the global requirements list. We should sync up the versions of the rest of the libraries. Change-Id: I0eff3ddecb80f057bb4998a48c8b32b3c1cf8b00 --- requirements.txt | 8 ++++---- test-requirements.txt | 2 +- tox.ini | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 69e4183664..963aa91eb7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,18 +5,18 @@ pbr>=0.6,!=0.7,<1.0 Babel>=1.3 -oslo.concurrency>=0.3.0 # Apache-2.0 +oslo.concurrency>=1.4.1 # Apache-2.0 oslo.config>=1.6.0 oslo.context>=0.1.0 # Apache-2.0 -oslo.db>=1.3.0 # Apache-2.0 -oslo.messaging>=1.4.0,!=1.5.0 +oslo.db>=1.4.1 # Apache-2.0 +oslo.messaging>=1.6.0 oslo.serialization>=1.2.0 # Apache-2.0 oslo.utils>=1.2.0 # Apache-2.0 paramiko>=1.13.0 pecan>=0.8.0 keystonemiddleware>=1.0.0 python-heatclient>=0.2.9 -python-keystoneclient>=0.11.1 +python-keystoneclient>=1.0.0 python-kubernetes>=0.2 python-zaqarclient>=0.0.3 six>=1.7.0 diff --git a/test-requirements.txt b/test-requirements.txt index 470c8faf6c..fce7396d68 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.9.2,<0.10 +hacking<0.11,>=0.10.0 coverage>=3.6 discover diff --git a/tox.ini b/tox.ini index c21b2cdafc..83fdbf9f90 100644 --- a/tox.ini +++ b/tox.ini @@ -40,6 +40,7 @@ commands = # The rest of the ignores are TODOs # New from hacking 0.9: E129, E131, H407, H405, H904 # E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301 +# TODO(dims): Fix temporarily ignored H105, H238, W292 -ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H302,H405,H803,H904,E711 +ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H302,H105,H238,H405,H803,H904,E711,W292 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools