diff options
author | Louis Taylor <louis@kragniz.eu> | 2015-06-05 14:54:58 +0000 |
---|---|---|
committer | Louis Taylor <louis@kragniz.eu> | 2015-06-05 15:23:33 +0000 |
commit | dfa98ab04c7fb7260b25e92af18caa2a016698c6 (patch) | |
tree | 4aed5b4e8b7653c99589a9141f11539dcf4fed2b | |
parent | d80c70e58abdc4260600ceadc81a49802d7878d6 (diff) | |
download | python-glanceclient-dfa98ab04c7fb7260b25e92af18caa2a016698c6.tar.gz |
Updated from global requirements
Also update hacking to
hacking>=0.10.0,<0.11
to get around breakage with pbr dependency.
Change-Id: Ic5e2d8df6993397ee4d1b087d96cc6667bd72acc
-rw-r--r-- | requirements.txt | 6 | ||||
-rw-r--r-- | test-requirements.txt | 4 | ||||
-rw-r--r-- | tox.ini | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt index 7245e72..7e68971 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.6,!=0.7,<1.0 +pbr>=0.11,<2.0 Babel>=1.3 argparse PrettyTable>=0.7,<0.8 -python-keystoneclient>=1.1.0 +python-keystoneclient>=1.6.0 pyOpenSSL>=0.11 -requests>=2.2.0,!=2.4.0 +requests>=2.5.2 warlock>=1.0.1,<2 six>=1.9.0 oslo.utils>=1.4.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index c2c4b42..99714ee 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.8.0,<0.9 +hacking>=0.10.0,<0.11 coverage>=3.6 discover @@ -12,4 +12,4 @@ testrepository>=0.0.18 testtools>=0.9.36,!=1.2.0 fixtures>=0.3.14 requests-mock>=0.6.0 # Apache-2.0 -tempest-lib>=0.4.0 +tempest-lib>=0.5.0 @@ -40,6 +40,15 @@ downloadcache = ~/cache/pip # H302 import only modules # H303 no wildcard import # H404 multi line docstring should start with a summary -ignore = F403,F812,F821,H233,H302,H303,H404 + +# TODO(kragniz) fix these and remove from the ignore list + +# E265 block comment should start with '# ' +# H405 multi line docstring summary not separated with an empty line +# E123 closing bracket does not match indentation of opening bracket's line +# H238 old style class declaration, use new style (inherit from `object`) +# E128 continuation line under-indented for visual indent + +ignore = F403,F812,F821,H233,H302,H303,H404,E265,H405,E123,H238,E128 show-source = True exclude = .venv,.tox,dist,*egg,build |