hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug with '# noqa' filtering (#3993)

Browse source
This commit is contained in:
Adam J. Stewart 2017-04-26 00:23:01 -05:00 committed by Todd Gamblin
parent 33c9a91d85
commit 11dae722c2
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/spack/spack/cmd/flake8.py
View file

@ -139,14 +139,6 @@ def filter_file(source, dest, output=False):
# We still want to catch trailing whitespace warnings # We still want to catch trailing whitespace warnings
line = line.rstrip('\n') line = line.rstrip('\n')
if line == '# flake8: noqa':
# Entire file is ignored
break
if line.endswith('# noqa'):
# Line is already ignored
continue
for file_pattern, errors in exemptions.items(): for file_pattern, errors in exemptions.items():
if not file_pattern.search(source): if not file_pattern.search(source):
continue continue
@ -154,7 +146,10 @@ def filter_file(source, dest, output=False):
for code, patterns in errors.items(): for code, patterns in errors.items():
for pattern in patterns: for pattern in patterns:
if pattern.search(line): if pattern.search(line):
if '# noqa: ' in line: if line.endswith('# noqa'):
# Line is already ignored
pass
elif '# noqa: ' in line:
line += ',{0}'.format(code) line += ',{0}'.format(code)
else: else:
line += ' # noqa: {0}'.format(code) line += ' # noqa: {0}'.format(code)

6
var/spack/repos/builtin.mock/packages/flake8/package.py
View file

@ -71,7 +71,11 @@ class Flake8(Package):
patch('hyper-specific-patch-that-fixes-some-random-bug-that-probably-only-affects-one-user.patch', when='%gcc@3.2.2:3.2.3') patch('hyper-specific-patch-that-fixes-some-random-bug-that-probably-only-affects-one-user.patch', when='%gcc@3.2.2:3.2.3')
def install(self, spec, prefix): def install(self, spec, prefix):
pass # Make sure lines with '# noqa' work as expected. Don't just
# remove them entirely. This will mess up the indentation of
# the following lines.
if 'really-long-if-statement' != 'that-goes-over-the-line-length-limit-and-requires-noqa': # noqa
pass
# '@when' decorated functions are exempt from redefinition errors # '@when' decorated functions are exempt from redefinition errors
@when('@2.0') @when('@2.0')