diff --git a/changelogs/fragments/ansible-test-cleanup-pylint-config.yml b/changelogs/fragments/ansible-test-cleanup-pylint-config.yml new file mode 100644 index 00000000000..f85e7588891 --- /dev/null +++ b/changelogs/fragments/ansible-test-cleanup-pylint-config.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Reorganize internal ``pylint`` configuration files for easier comparison and maintenance. diff --git a/test/lib/ansible_test/_data/sanity/pylint/config/ansible-test.cfg b/test/lib/ansible_test/_data/sanity/pylint/config/ansible-test.cfg index d3643162c7d..ab07dde0f10 100644 --- a/test/lib/ansible_test/_data/sanity/pylint/config/ansible-test.cfg +++ b/test/lib/ansible_test/_data/sanity/pylint/config/ansible-test.cfg @@ -1,8 +1,11 @@ [MESSAGES CONTROL] disable= + consider-using-dict-comprehension, # requires Python 2.7+, but we still require Python 2.6 support + consider-using-set-comprehension, # requires Python 2.7+, but we still require Python 2.6 support cyclic-import, # consistent results require running with --jobs 1 and testing all files duplicate-code, # consistent results require running with --jobs 1 and testing all files + no-self-use, too-few-public-methods, too-many-arguments, too-many-branches, @@ -12,28 +15,27 @@ disable= too-many-nested-blocks, too-many-return-statements, too-many-statements, - no-self-use, unused-import, # pylint does not understand PEP 484 type hints - consider-using-dict-comprehension, # requires Python 2.6, which we still support - consider-using-set-comprehension, # requires Python 2.6, which we still support [BASIC] -bad-names=foo, - bar, - baz, - toto, - tutu, - tata, - _, +bad-names= + _, + bar, + baz, + foo, + tata, + toto, + tutu, -good-names=i, - j, - k, - ex, - Run, - C, - __metaclass__, +good-names= + __metaclass__, + C, + ex, + i, + j, + k, + Run, method-rgx=[a-z_][a-z0-9_]{2,40}$ function-rgx=[a-z_][a-z0-9_]{2,40}$ diff --git a/test/lib/ansible_test/_data/sanity/pylint/config/collection.cfg b/test/lib/ansible_test/_data/sanity/pylint/config/collection.cfg index c2d75b1c409..7405a540dd7 100644 --- a/test/lib/ansible_test/_data/sanity/pylint/config/collection.cfg +++ b/test/lib/ansible_test/_data/sanity/pylint/config/collection.cfg @@ -17,11 +17,11 @@ disable= comparison-with-callable, consider-iterating-dictionary, consider-merging-isinstance, - consider-using-dict-comprehension, + consider-using-dict-comprehension, # requires Python 2.7+, but we still require Python 2.6 support consider-using-enumerate, consider-using-get, consider-using-in, - consider-using-set-comprehension, + consider-using-set-comprehension, # requires Python 2.7+, but we still require Python 2.6 support consider-using-ternary, cyclic-import, # consistent results require running with --jobs 1 and testing all files deprecated-lambda, @@ -115,19 +115,21 @@ disable= [BASIC] -bad-names=foo, - bar, - baz, - toto, - tutu, - tata, - _, +bad-names= + _, + bar, + baz, + foo, + tata, + toto, + tutu, -good-names=i, - j, - k, - ex, - Run, +good-names= + ex, + i, + j, + k, + Run, [TYPECHECK] diff --git a/test/lib/ansible_test/_data/sanity/pylint/config/default.cfg b/test/lib/ansible_test/_data/sanity/pylint/config/default.cfg index 451990784e7..41ffc11db74 100644 --- a/test/lib/ansible_test/_data/sanity/pylint/config/default.cfg +++ b/test/lib/ansible_test/_data/sanity/pylint/config/default.cfg @@ -17,11 +17,11 @@ disable= comparison-with-callable, consider-iterating-dictionary, consider-merging-isinstance, - consider-using-dict-comprehension, + consider-using-dict-comprehension, # requires Python 2.7+, but we still require Python 2.6 support consider-using-enumerate, consider-using-get, consider-using-in, - consider-using-set-comprehension, + consider-using-set-comprehension, # requires Python 2.7+, but we still require Python 2.6 support consider-using-ternary, cyclic-import, # consistent results require running with --jobs 1 and testing all files deprecated-lambda, @@ -115,19 +115,21 @@ disable= [BASIC] -bad-names=foo, - bar, - baz, - toto, - tutu, - tata, - _, +bad-names= + _, + bar, + baz, + foo, + tata, + toto, + tutu, -good-names=i, - j, - k, - ex, - Run, +good-names= + ex, + i, + j, + k, + Run, [TYPECHECK] diff --git a/test/lib/ansible_test/_data/sanity/pylint/config/sanity.cfg b/test/lib/ansible_test/_data/sanity/pylint/config/sanity.cfg index f601ab57d36..42c5551b3c3 100644 --- a/test/lib/ansible_test/_data/sanity/pylint/config/sanity.cfg +++ b/test/lib/ansible_test/_data/sanity/pylint/config/sanity.cfg @@ -1,8 +1,11 @@ [MESSAGES CONTROL] disable= + consider-using-dict-comprehension, # requires Python 2.7+, but we still require Python 2.6 support + consider-using-set-comprehension, # requires Python 2.7+, but we still require Python 2.6 support cyclic-import, # consistent results require running with --jobs 1 and testing all files duplicate-code, # consistent results require running with --jobs 1 and testing all files + missing-docstring, too-few-public-methods, too-many-arguments, too-many-branches, @@ -12,30 +15,29 @@ disable= too-many-nested-blocks, too-many-return-statements, too-many-statements, - missing-docstring, unused-import, # pylint does not understand PEP 484 type hints - consider-using-dict-comprehension, # requires Python 2.6, which we still support - consider-using-set-comprehension, # requires Python 2.6, which we still support [BASIC] -bad-names=foo, - bar, - baz, - toto, - tutu, - tata, - _, +bad-names= + _, + bar, + baz, + foo, + tata, + toto, + tutu, -good-names=i, - j, - k, - f, - e, - ex, - Run, - C, - __metaclass__, +good-names= + __metaclass__, + C, + e, + ex, + f, + i, + j, + k, + Run, module-rgx=[a-z_][a-z0-9_-]{2,40}$ method-rgx=[a-z_][a-z0-9_]{2,40}$