summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-13 22:18:06 +0000
committerGerrit Code Review <review@openstack.org>2015-01-13 22:18:06 +0000
commit166eebfbc3b4f633ad11f566c9068a5e2bc6d633 (patch)
tree59aa4e2f1774822ae969b2288812d4b23f4059a7
parentbbc136495f3de10ef3189a1ebe99fc5de4ecd81d (diff)
parent6ae01277636c941e2782f8c4d6c90cdc66356c45 (diff)
downloadpython-ceilometerclient-166eebfbc3b4f633ad11f566c9068a5e2bc6d633.tar.gz
Merge "Update hacking to global requirements"
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini3
2 files changed, 3 insertions, 2 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index bc2d0a1..6dffed5 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 already pins down pep8, pyflakes and flake8
-hacking>=0.9.1,<0.10
+hacking>=0.10.0,<0.11
coverage>=3.6
discover
fixtures>=0.3.14
diff --git a/tox.ini b/tox.ini
index 480a6d6..5013166 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,6 +31,7 @@ commands=
[flake8]
# H405 multi line docstring summary not separated with an empty line
# H904 Wrap long lines in parentheses instead of a backslash
-ignore = H405,H904
+# H105 Don't use author tags
+ignore = H405,H904,H105
show-source = True
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools