diff --git a/scrub/__init__.py b/scrub/__init__.py index 68c26cd..0b25d8d 100644 --- a/scrub/__init__.py +++ b/scrub/__init__.py @@ -2,7 +2,7 @@ __author__ = """Lyle Barner""" __email__ = 'lyle.barner@jpl.nasa.gov' -__version__ = '2.8.1' +__version__ = '2.8.2' # Check the Python version for compatibility diff --git a/scrub/utils/filtering/filter_results.py b/scrub/utils/filtering/filter_results.py index f87b9a2..520ee5c 100644 --- a/scrub/utils/filtering/filter_results.py +++ b/scrub/utils/filtering/filter_results.py @@ -5,7 +5,6 @@ # Initialize variables -# 'compiler': ['compiler', 'cmp', 'gbuild', 'dblchck', 'doublecheck', 'javac', 'pylint'], suppression_lines = [] filtering_aliases = {'gcc': ['cmp', 'compiler', 'gcc'], 'gbuild': ['cmp', 'compiler', 'gbuild', 'dblchck', 'doublecheck'], @@ -43,11 +42,13 @@ def micro_filter_check(source_file, warning_line, valid_warning_types): line = input_fh.readlines()[warning_line - 1] # Check for suppression syntax - if (ignore_base in line.lower()) or ('@suppress' in line.lower()): + l_line = line.lower().strip() + if ignore_base in l_line or '@suppress' in l_line: for check_type in valid_warning_types: - if line.lower().strip().endswith(check_type): + if check_type in l_line: # Print a status message logging.debug('\tWarning removed - Warning has been marked as a false positive') + logging.debug('\t\t{}: {}'.format(str(source_file), str(warning_line))) logging.debug('\t\t%s', line) # Update the output diff --git a/setup.cfg b/setup.cfg index 7721485..57add49 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,7 +19,7 @@ project_urls = Documentation = https://nasa.github.io/scrub Source = https://github.com/nasa/scrub url = https://github.com/nasa/scrub -version = 2.8.1 +version = 2.8.2 [options] @@ -42,8 +42,8 @@ exclude = tests [bumpversion] -new_version = 2.8.1 -current_version = 2.8 +new_version = 2.8.2 +current_version = 2.8.1 commit = True tag = True