Updated from global requirements

Added exclusions for newly triggered errors.

Change-Id: I580c4a6a3861c399e010f435c0b92ed719d6a418

diff --git a/requirements.txt b/requirements.txt
index 36d7a1bf32e992eb02f9ee488678f286eb69f2d9..c8be96ccb9ec53666891550c5f8f6dba74f420d8 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ netaddr>=0.7.6
 python-neutronclient>=2.3.4,<3
 SQLAlchemy>=0.7.8,<=0.9.99
 WebOb>=1.2.3
-python-keystoneclient>=0.8.0
+python-keystoneclient>=0.9.0
 alembic>=0.4.1
 six>=1.6.0
 stevedore>=0.14

diff --git a/test-requirements.txt b/test-requirements.txt
index ec522301517072fe91c9c040afdbffa8f97a83ac..c810f788fa9a3a502f9a73d7ade11522fec27bb9 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-hacking>=0.8.0,<0.9
+hacking>=0.9.1,<0.10
 
 cliff>=1.4.3
 coverage>=3.6

diff --git a/tox.ini b/tox.ini
index 297998a8c2f62879c59da4fb10f77e439f7f32e7..77141e06da8048046b203a234f5351c4cda1affd 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -40,9 +40,30 @@ commands =
 commands = {posargs}
 
 [flake8]
+# E112 expected an idented block
+# E122 continuation line missing indentation or outdented
 # E125 continuation line does not distinguish itself from next logical line
+# E126 continuation line over-indented for hanging indent
+# E128 continuation line under-indented for visual indent
+# E129 visually indented line with same indent as next logical line
+# E251 unexpected spaces around keyword / parameter equals
+# E265 block comment should start with ‘# ‘
+# E713 test for membership should be ‘not in’
+# F402 import module shadowed by loop variable
+# F811 redefinition of unused variable
+# F812 list comprehension redefines name from line
+# H104 file contains nothing but comments
+# H237 module is removed in Python 3
+# H302 import only modules
+# H304 no relative imports
+# H305 imports not grouped correctly
+# H307 like imports should be grouped together
+# H401 docstring should not start with a space
+# H402 one line docstring needs punctuation
+# H405 multi line docstring summary not separated with an empty line
+# H904 Wrap long lines in parentheses instead of a backslash
 # TODO(marun) H404 multi line docstring should start with a summary
-ignore = E125,H404
+ignore = E112,E122,E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H104,H237,H302,H304,H305,H307,H401,H402,H404,H405,H904
 show-source = true
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject