From ca91d4d871bae437da2c6173e7a0aad5c3b44532 Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Tue, 10 Apr 2018 16:48:00 -0700 Subject: [PATCH] Remove pycodestyle version pin. Add E402 and W503 to ignore. Rather than pinning pycodestyle, ignore the E402 and W503 error. Fix issue with E731 (Do not assign a lambda expression, use a def). W503 is something we will likely never enable as it is a personal style decision and can change depending on the code. There is no one right answer. Interestingly there is also a W504 which is the opposite check. E402 is one we should most likely fix. But it can be done in a follow patch or patches. List of various error codes: https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes Change-Id: Ie2c31a8a3c75beeef22453cab5878cf0094bdf3f --- ironic/tests/unit/common/test_images.py | 3 ++- test-requirements.txt | 1 - tox.ini | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ironic/tests/unit/common/test_images.py b/ironic/tests/unit/common/test_images.py index faf4cf08cd..11d7981a34 100644 --- a/ironic/tests/unit/common/test_images.py +++ b/ironic/tests/unit/common/test_images.py @@ -261,7 +261,8 @@ class FsImageTestCase(base.TestCase): def test__create_root_fs(self, path_exists_mock, dirname_mock, mkdir_mock, cp_mock): - path_exists_mock_func = lambda path: path == 'root_dir' + def path_exists_mock_func(path): + return path == 'root_dir' files_info = { 'a1': 'b1', diff --git a/test-requirements.txt b/test-requirements.txt index 57963854a6..eeea491e03 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,4 +18,3 @@ testscenarios>=0.4 # Apache-2.0/BSD WebTest>=2.0.27 # MIT bashate>=0.5.1 # Apache-2.0 flake8-import-order>=0.13 # LGPLv3 -pycodestyle<=2.3.1 diff --git a/tox.ini b/tox.ini index 0f4cb7d889..589792f820 100644 --- a/tox.ini +++ b/tox.ini @@ -101,7 +101,10 @@ setenv = PYTHONHASHSEED=0 commands = {posargs} [flake8] -ignore = E129 +# TODO(jlvillal): We should fix the E402 errors +# [E402] Module level import not at top of file +# [W503] Line break before binary operator. +ignore = E129,E402,W503 filename = *.py,app.wsgi exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build import-order-style = pep8