Skip to content

Commit

Permalink
Merge pull request #108 from nasa/release-2.8.2
Browse files Browse the repository at this point in the history
Release 2.8.2
  • Loading branch information
lylebarner authored Oct 30, 2023
2 parents 665e2cc + fca1c59 commit b58f893
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion scrub/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

__author__ = """Lyle Barner"""
__email__ = '[email protected]'
__version__ = '2.8.1'
__version__ = '2.8.2'


# Check the Python version for compatibility
Expand Down
7 changes: 4 additions & 3 deletions scrub/utils/filtering/filter_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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

Expand Down

0 comments on commit b58f893

Please sign in to comment.