Apply Flake8 to check PEP8

Author: bjk7119

requirements.txt

@@ -4,3 +4,6 @@ typecode_libmagic
 XlsxWriter
 fosslight_util
 PyYAML
+pytest
+pytest-cov
+pytest-flake8

src/fosslight_source/_help.py

@@ -5,30 +5,32 @@
 from fosslight_util.help import PrintHelpMsg
 
 _HELP_MESSAGE_SOURCE = """
-    Usage: fosslight_source [option1] <arg1> [option2] <arg2>... 
+    Usage: fosslight_source [option1] <arg1> [option2] <arg2>...
 
-    FOSSLight Source uses ScanCode, a source code scanner, to detect the copyright and license phrases contained in the file.
-    Some files (ex- build script), binary files, directory and files in specific directories (ex-test) are excluded from the result. 
-    And removes words such as “-only” and “-old-style” from the license name to be printed. The output result is generated in Excel format.
+    FOSSLight Source uses ScanCode, a source code scanner, to detect the copyright and license phrases
+    contained in the file. Some files (ex- build script), binary files, directory and files in specific
+    directories (ex-test) are excluded from the result.
+    And removes words such as “-only” and “-old-style” from the license name to be printed.
+    The output result is generated in Excel format.
 
     Options:
         Mandatory
             -p <source_path>\t\t   Path to analyze source
-        
+
         Optional
             -h\t\t\t\t   Print help message
             -j\t\t\t\t   Generate additional result of executing ScanCode in json format
             -o <file_name>\t\t   Output file name"""
 
 _HELP_MESSAGE_CONVERT = """
-    Usage: fosslight_convert [option1] <arg1> [option2] <arg2>... 
+    Usage: fosslight_convert [option1] <arg1> [option2] <arg2>...
 
     FOSSLigtht_convert converts the result of executing ScanCode in json format into OSS Report format.
 
     Options:
         Mandatory
             -p <path_dir>\t\t   Path of ScanCode json files
-        
+
         Optional
             -h\t\t\t\t   Print help message
             -o <file_name>\t\t   Output file name"""
@@ -38,6 +40,7 @@ def print_help_msg_source():
     helpMsg = PrintHelpMsg(_HELP_MESSAGE_SOURCE)
     helpMsg.print_help_msg(True)
 
+
 def print_help_msg_convert():
     helpMsg = PrintHelpMsg(_HELP_MESSAGE_CONVERT)
     helpMsg.print_help_msg(True)

src/fosslight_source/_parsing_scancode_file_item.py

@@ -100,7 +100,7 @@ def parsing_file_item(scancode_file_list):
 
     rc = True
     scancode_file_item = []
-    msg ="TOTAL FILE COUNT: "+str(len(scancode_file_list))+"\n"
+    msg = "TOTAL FILE COUNT: " + str(len(scancode_file_list)) + "\n"
 
     prev_dir = ""
     prev_dir_value = False

src/fosslight_source/convert_scancode.py

@@ -7,7 +7,6 @@
 import os
 import sys
 import json
-import platform
 from datetime import datetime
 import logging
 import fosslight_util.constant as constant
@@ -51,25 +50,25 @@ def convert_json_to_excel(scancode_json, excel_name):
                                     file_list, key=lambda row: (''.join(row.licenses)))
                                 sheet_list["SRC_" + file_name] = [scan_item.get_row_to_print() for scan_item in file_list]
                         except Exception as ex:
-                            logger.warning("Error parsing "+file+":"+str(ex))
+                            logger.warning("Error parsing "+file+":" + str(ex))
 
         success_to_write, writing_msg = write_excel_and_csv(excel_name, sheet_list)
-        logger.info("Writing excel :"+str(success_to_write)+ " "+writing_msg)
+        logger.info("Writing excel :" + str(success_to_write) + " " + writing_msg)
         if success_to_write:
-            _result_log["OSS Report"] = excel_name+".xlsx"
+            _result_log["OSS Report"] = excel_name + ".xlsx"
 
     except Exception as ex:
         success = False
         logger.warning(str(ex))
 
-    scan_result_msg = str(success)+" "+msg
+    scan_result_msg = str(success) + " " + msg
     _result_log["Scan Result"] = scan_result_msg.strip()
 
     try:
         _str_final_result_log = yaml.safe_dump(_result_log, allow_unicode=True, sort_keys=True)
         logger.info(_str_final_result_log)
     except Exception as ex:
-        logger.warning("Failed to print result log.: "+ str(ex))
+        logger.warning("Failed to print result log.: " + str(ex))
 
     return file_list
 
@@ -80,10 +79,10 @@ def get_detected_licenses_from_scancode(scancode_json_file):
         logger.info("Start parsing " + scancode_json_file)
         with open(scancode_json_file, "r") as st_json:
             st_python = json.load(st_json)
-            rc, file_list, msg= parsing_file_item(st_python["files"])
-            logger.info("|---"+msg)
+            rc, file_list, msg = parsing_file_item(st_python["files"])
+            logger.info("|---" + msg)
     except Exception as error:
-        logger.warning("Parsing "+scancode_json_file+":"+str(error))
+        logger.warning("Parsing " + scancode_json_file + ":" + str(error))
     logger.info("|---Number of files detected: " + str(len(file_list)))
     return file_list
 
@@ -106,7 +105,7 @@ def main():
             elif opt == "-o":
                 output_file_name = arg
     except Exception as error:
-        pass
+        print("Wrong option " + str(error))
 
     if output_file_name == "":
         output_dir = os.getcwd()

src/fosslight_source/run_scancode.py

@@ -113,27 +113,27 @@ def run_scan(path_to_scan, output_file_name="",
 
                             success_to_write, writing_msg = write_excel_and_csv(
                                 output_file, sheet_list)
-                            logger.info("Writing excel :"+str(success_to_write)+ " "+writing_msg)
+                            logger.info("Writing excel :" + str(success_to_write) + " " + writing_msg)
                             if success_to_write:
-                                _result_log["OSS Report"] = output_file +".xlsx"
+                                _result_log["OSS Report"] = output_file + ".xlsx"
         except Exception as ex:
             success = False
             msg = str(ex)
-            logger.error("Analyze "+path_to_scan+":"+msg)
+            logger.error("Analyze " + path_to_scan + ":" + msg)
     else:
         success = False
         msg = "Check the path to scan. :" + path_to_scan
 
     if not return_results:
         result_list = []
-    scan_result_msg = str(success)+" "+msg
+    scan_result_msg = str(success) + " " + msg
     _result_log["Scan Result"] = scan_result_msg.strip()
     _result_log["Output Directory"] = output_dir
     try:
         _str_final_result_log = yaml.safe_dump(_result_log, allow_unicode=True, sort_keys=True)
         logger.info(_str_final_result_log)
     except Exception as ex:
-        logger.warning("Failed to print result log. "+ str(ex))
+        logger.warning("Failed to print result log. " + str(ex))
     return success, _result_log["Scan Result"], result_list
 
 

test/cli_test.py

@@ -3,10 +3,7 @@
 # Copyright (c) 2020 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-import getopt
 import os
-import sys
-import json
 from datetime import datetime
 import logging
 import fosslight_util.constant as constant
@@ -19,7 +16,6 @@
 def main():
     global logger
 
-    argv = sys.argv[1:]
     path_to_find_bin = os.path.abspath("test/test")
     start_time = datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
     output_file_name = ""

tox.ini

@@ -7,7 +7,17 @@ install_command = pip install {opts} {packages}
 basepython= python3.6
 whitelist_externals = cat
 
+[flake8]
+max-line-length = 130
+per-file-ignores = .tox/*
+
+[pytest]
+filterwarnings = ignore::DeprecationWarning
+
 [testenv:test_run]
+deps =
+  -r{toxinidir}/requirements.txt
+
 setenv =
   PYTHONPATH=.
 
@@ -19,3 +29,4 @@ commands =
     fosslight_convert -p test_scan/scan_result.json -o test_convert/convert_result
     cat test_convert/convert_result.csv
     python test/cli_test.py
+    pytest -v --flake8