NFVBENCH-216 Fix broken flake8 tests in CI

- remove version constraints on the "hacking" python package (flake8
  plugin that enforces openstack coding style) because this was the root
  cause holding flake8 in the past.

- require flake8>=3.3.0 to have python 3.6 support

- ignore all the new errors introduced by newer versions of the tools.
  The point here is to have flake8 back with equal functionality.  If
  wanted, some of the new error codes could be re-enabled, but this would
  require to fix the code and could lead to accidental regressions.

- align minimum package version numbers in requirements-dev.txt and
  test-requirements.txt

Signed-off-by: Gwenael Lambrouin <gwenael.lambrouin@orange.com>
Change-Id: I2e85aded58f1b2b9b5e750dba66ac68b13e150a5

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 276d014..f0ef0ab 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,8 +1,7 @@
 -r requirements.txt
 docutils==0.14.0
 -r requirements.txt
 docutils==0.14.0

-flake8>=2.3.0
-pylint>=1.3
-pep8>=1.5.7
+flake8>=3.3.0
+pylint>=1.7.1

 sphinx>=1.4.0
 sphinx_rtd_theme>=0.2.4
 tox>=2.3.0
 sphinx>=1.4.0
 sphinx_rtd_theme>=0.2.4
 tox>=2.3.0

diff --git a/test-requirements.txt b/test-requirements.txt
index a7e52ce..57ce9d7 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,14 +2,15 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 

-hacking<0.11,>=0.10.0
+hacking

 
 coverage>=3.6
 discover
 
 coverage>=3.6
 discover

+flake8>=3.3.0

 python-subunit>=0.0.18
 scapy>=2.3.1
 sphinx>=1.4.0
 python-subunit>=0.0.18
 scapy>=2.3.1
 sphinx>=1.4.0

-sphinx_rtd_theme>=0.1.9
+sphinx_rtd_theme>=0.2.4

 oslosphinx>=2.5.0  # Apache-2.0
 oslotest>=1.10.0  # Apache-2.0
 testrepository>=0.0.18
 oslosphinx>=2.5.0  # Apache-2.0
 oslotest>=1.10.0  # Apache-2.0
 testrepository>=0.0.18

diff --git a/tox.ini b/tox.ini
index 4fe1e35..926e603 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -32,19 +32,39 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 [flake8]
 # H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.
 [flake8]
 # H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.

+# E117,E126,E127,E128,E211,E226,E231,E252,E305,E731,W503,W504 skipped as they
+# are introduced by newer versions of flake8 (update from 2.2.4 to 3.9.2)
+# H216,H301,H401 skipped as they are introduced by newer version of hacking
+# (update from 0.10.3 to 4.1.0)

 max-line-length = 100
 show-source = True
 max-line-length = 100
 show-source = True

+#E117: over-indented (comment)
+#E126: continuation line over-indented for hanging indent
+#E127: continuation line over-indented for visual indent
+#E128: continuation line under-indented for visual indent
+#E211: whitespace before '('
+#E226: missing whitespace around arithmetic operator
+#E231: missing whitespace after ','
+#E252: missing whitespace around parameter equals

 #E302: expected 2 blank linee
 #E303: too many blank lines (2)
 #E302: expected 2 blank linee
 #E303: too many blank lines (2)

+#E305: expected 2 blank lines after class or function definition, found 1
+#E731: do not assign a lambda expression, use a def
+#W503: line break before binary operator
+#W504: line break after binary operator
+#H101: Use TODO(NAME)
+#H216: The unittest.mock module should be used rather than the third party mock package unless actually needed. If so, disable the H216 check in hacking config and ensure mock is declared in the project's requirements.

 #H233: Python 3.x incompatible use of print operator
 #H236: Python 3.x incompatible __metaclass__, use six.add_metaclass()
 #H233: Python 3.x incompatible use of print operator
 #H236: Python 3.x incompatible __metaclass__, use six.add_metaclass()

+#H301: one import per line

 #H302: import only modules.
 #H304: No relative imports
 #H306: imports not in alphabetical order
 #H302: import only modules.
 #H304: No relative imports
 #H306: imports not in alphabetical order

+#H401: docstring should not start with a space

 #H404: multi line docstring should start without a leading new line
 #H405: multi line docstring summary not separated with an empty line
 #H904: Wrap long lines in parentheses instead of a backslash
 #H404: multi line docstring should start without a leading new line
 #H405: multi line docstring summary not separated with an empty line
 #H904: Wrap long lines in parentheses instead of a backslash

-ignore = E123,E125,H803,E302,E303,H104,H233,H236,H302,H304,H306,H404,H405,H904,D102,D100,D107
+ignore = E117,E123,E125,E126,E127,E128,E211,E226,E231,E252,E302,E303,E305,E731,W503,W504,H101,H104,H216,H233,H236,H301,H302,H304,H306,H401,H404,H405,H803,H904,D102,D100,D107

 builtins = _
 exclude=venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,dib-venv
 
 builtins = _
 exclude=venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,dib-venv