Merge pull request #112 from nasa/release-2.8.5

Release 2.8.5
nasa · Mar 20, 2024 · 898107c · 898107c
2 parents ad97e9c + 1b8b749
commit 898107c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/scrub/__init__.py b/scrub/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """Lyle Barner"""
 __email__ = '[email protected]'
-__version__ = '2.8.4'
+__version__ = '2.8.5'
 
 
 # Check the Python version for compatibility

diff --git a/scrub/targets/scrub_gui/do_scrub_gui.py b/scrub/targets/scrub_gui/do_scrub_gui.py
@@ -1,4 +1,3 @@
-import re
 import pathlib
 import logging
 import traceback

diff --git a/scrub/tools/parsers/get_coverity_warnings.py b/scrub/tools/parsers/get_coverity_warnings.py
@@ -31,7 +31,7 @@ def parse_json(raw_input_file, parsed_output_file):
         warning_file = pathlib.Path(issue['mainEventFilePathname'])
         warning_line = int(issue['mainEventLineNumber'])
         warning_checker = issue['checkerName']
-        warning_description = issue['checkerProperties']['subcategoryLongDescription']
+        warning_description = issue['checkerProperties']['subcategoryLongDescription'].encode("unicode_escape").decode("utf-8")
         warning_code_flow = []
 
         if issue['checkerProperties']['impact'].lower() == 'high':
@@ -50,9 +50,8 @@ def parse_json(raw_input_file, parsed_output_file):
             if event['eventTag'] != 'caretline':
                 event_file =event['strippedFilePathname']
                 event_line = event['lineNumber']
-                event_description = '{}: {}'.format(event['eventTag'], event['eventDescription'])
-                # warning_description.append('{}:{}:'.format(event_file, event_line))
-                # warning_description.append(event_description)
+                event_description = '{}: {}'.format(event['eventTag'],
+                                                    event['eventDescription']).encode("unicode_escape").decode("utf-8")
 
                 # Add to the code flow
                 warning_code_flow.append(translate_results.create_code_flow(event_file, event_line, event_description))

diff --git a/scrub/tools/templates/sonarqube.template b/scrub/tools/templates/sonarqube.template
@@ -99,7 +99,7 @@ if [ -n "${{SONARQUBE_BUILD_CMD}}" ]; then
     cd ${{SOURCE_DIR}}
 
     # Perform SonarQube analysis
-    ${{SONARQUBE_PATH}}/sonar-scanner $file_extension_filters -X -D sonar.java.binaries=${{SOURCE_DIR}} -D sonar.cfamily.cache.enabled=false -D sonar.host.url=${{SONARQUBE_SERVER}} -D sonar.projectKey=${{SONARQUBE_PROJECT}} -D sonar.login=${{SONARQUBE_TOKEN}} -D sonar.cfamily.build-wrapper-output=${{TOOL_ANALYSIS_DIR}}/build_wrapper_output -D sonar.working.directory=${{TOOL_ANALYSIS_DIR}}/scanner_output ${{SONARQUBE_SCANNER_FLAGS}}
+    ${{SONARQUBE_PATH}}/sonar-scanner $file_extension_filters -X -D sonar.java.binaries=${{SOURCE_DIR}} -D sonar.host.url=${{SONARQUBE_SERVER}} -D sonar.projectKey=${{SONARQUBE_PROJECT}} -D sonar.login=${{SONARQUBE_TOKEN}} -D sonar.cfamily.build-wrapper-output=${{TOOL_ANALYSIS_DIR}}/build_wrapper_output -D sonar.working.directory=${{TOOL_ANALYSIS_DIR}}/scanner_output ${{SONARQUBE_SCANNER_FLAGS}}
 
 # Capture all other languages
 else

diff --git a/scrub/utils/scrub_utilities.py b/scrub/utils/scrub_utilities.py
@@ -331,10 +331,6 @@ def parse_common_configs(user_conf_file, raw_override_values, scrub_keys=[]):
     scrub_init_data = configparser.ConfigParser()
     scrub_init_data.read(scrub_init_path)
 
-    # Set the keys, if necessary
-    # if not scrub_keys:
-    #     scrub_keys = scrub_init_data.sections()
-
     # Convert to a dictionary
     for key in scrub_init_data.sections():
         scrub_conf_data.update(dict(scrub_init_data.items(key)))

diff --git 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.4
+version = 2.8.5
 
 
 [options]
@@ -42,8 +42,8 @@ exclude =
     tests
 
 [bumpversion]
-new_version = 2.8.4
-current_version = 2.8.3
+new_version = 2.8.5
+current_version = 2.8.4
 commit = True
 tag = True