Skip to content

Change OSS report name to FOSSLight report #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2021
Merged

Change OSS report name to FOSSLight report #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/fosslight_util/write_excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion tests/test_excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
6 changes: 3 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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
pytest -v --flake8