summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-22 14:34:06 +0000
committerGerrit Code Review <review@openstack.org>2016-01-22 14:34:06 +0000
commit2d19308e0daa52d7386792f6ddc5cb1cc86aee91 (patch)
tree6f126da3316f8aadaa4a2d4d65a99ecc8a6869ee
parenta2db877b41fad494fe9daa09b5c77914638ac605 (diff)
parentcfd29196fedf41dcd61d0df6b0109dc8e43abfc8 (diff)
downloados-client-config-2d19308e0daa52d7386792f6ddc5cb1cc86aee91.tar.gz
Merge "Clean up removed hacking rule from [flake8] ignore lists"
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 3 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index a50a202..5e4c304 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.10.2,<0.11 # Apache-2.0
coverage>=3.6
extras
diff --git a/tox.ini b/tox.ini
index 617831d..c3f42d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,10 @@ commands =
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[flake8]
-# H803 skipped on purpose per list discussion.
# E123, E125 skipped as they are invalid PEP-8.
show-source = True
-ignore = E123,E125,H803
+ignore = E123,E125
builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,releasenotes/source/conf.py
+