diff --git a/README.md b/README.md index 4a710d8..30a4814 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ It is a package that supports common utils used by FOSSLight Scanner. ## Features 1. It simplifies the logger setup. -2. It easily outputs csv file and excel file in OSS Report format. +2. It easily outputs csv file and excel file in FOSSLight Report format. 3. It provides a simple function to create a text file. 4. It defines common constant variables. 5. It provides a thread that prints the spinner. @@ -73,7 +73,7 @@ def test(): '0.4.3', 'Apache-2.0', 'https://github.com/jpeddicord/askalono', '', 'Copyright (c) 2018 Amazon.com, Inc. or its affiliates.', '', '']]} success, msg = write_excel_and_csv( - 'test_result/excel/OSS-Report', sheet_contents) + 'test_result/excel/FOSSLight-Report', sheet_contents) ``` ### 3. Write a text file (tests/test_text.py) diff --git a/src/fosslight_util/write_excel.py b/src/fosslight_util/write_excel.py index 1518c6d..72e3fee 100755 --- a/src/fosslight_util/write_excel.py +++ b/src/fosslight_util/write_excel.py @@ -19,9 +19,9 @@ 'BIN': ['ID', 'Binary Name', 'OSS Name', 'OSS Version', 'License', 'Download Location', 'Homepage', 'Copyright Text', 'Exclude', 'Comment']} -_OUTPUT_FILE_PREFIX = "OSS-Report_" +_OUTPUT_FILE_PREFIX = "FOSSLight-Report_" _EMPTY_ITEM_MSG = "* There is no item"\ - " to print in OSS-Report.\n" + " to print in FOSSLight-Report.\n" logger = logging.getLogger(constant.LOGGER_NAME) diff --git a/tests/test_excel.py b/tests/test_excel.py index c3c92fd..8dcaf39 100755 --- a/tests/test_excel.py +++ b/tests/test_excel.py @@ -40,7 +40,7 @@ def main(): sheet_contents['SRC_NULL'] = [] sheet_contents['NULL_SHEET'] = [] success, msg = write_excel_and_csv( - 'test_result/excel/OSS-Report', sheet_contents) + 'test_result/excel/FOSSLight-Report', sheet_contents) logger.warning("Result:" + str(success) + ", error_msg:" + msg) diff --git a/tox.ini b/tox.ini index 8a55ba4..5ac8e58 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,7 @@ commands = # Test - writing excel python tests/test_excel.py ls test_result/excel - cat test_result/excel/OSS-Report.csv + cat test_result/excel/FOSSLight-Report.csv [testenv:release] deps = @@ -53,8 +53,8 @@ commands = # Test - writing excel python tests/test_excel.py ls test_result/excel - cat test_result/excel/OSS-Report.csv + cat test_result/excel/FOSSLight-Report.csv # Test - timer python tests/test_timer.py # Test - check PEP8 - pytest -v --flake8 \ No newline at end of file + pytest -v --flake8