summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-13 08:03:25 +0000
committerGerrit Code Review <review@openstack.org>2015-02-13 08:03:25 +0000
commit72a9c00625606341fc89b66736a53d67760a88b9 (patch)
tree96cb154c6497837bd1965e95c85d19a1d7ab1dc4
parent0a33d68c1e35bbc66b6a3e0331dfd196c9e1c4de (diff)
parentc7e472a6fec7f5c85e0a9dccb886ddfeb610f96b (diff)
downloadtaskflow-72a9c00625606341fc89b66736a53d67760a88b9.tar.gz
Merge "Move to hacking 0.10"
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini2
2 files changed, 1 insertions, 3 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index aba6262..dd4f36d 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
oslotest>=1.2.0 # Apache-2.0
mock>=1.0
testtools>=0.9.36,!=1.2.0
diff --git a/tox.ini b/tox.ini
index 4ef1c33..44571ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,8 +49,6 @@ deps = {[testenv:py27]deps}
commands = {posargs}
[flake8]
-# H904 Wrap long lines in parentheses instead of a backslash
-ignore = H904
builtins = _
exclude = .venv,.tox,dist,doc,./taskflow/openstack/common,*egg,.git,build,tools