Skip to content

Adoptions for Diagnostics #75

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
ct2034 merged 4 commits into from
Jan 27, 2025
Merged

Adoptions for Diagnostics #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad1bb8f
90 percent only and ignoring Changelog
ct2034 Jan 27, 2025
0c7f035
Merge branch 'main' into fix/diagnostics
ct2034 Jan 27, 2025
b66df5f
license in code is declared correctly
ct2034 Jan 27, 2025
dcb8650
also here bsd-3-clause is correct
ct2034 Jan 27, 2025
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
3 changes: 2 additions & 1 deletion src/ros_license_toolkit/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
import os
from typing import Any, Dict, List, Optional

REQUIRED_PERCENTAGE_OF_LICENSE_TEXT = 95.0
REQUIRED_PERCENTAGE_OF_LICENSE_TEXT = 90.0

# files we ignore in scan results
IGNORED = [
"CHANGELOG.rst",
".scanignore",
"package.xml",
"setup.py",
Expand Down
5 changes: 3 additions & 2 deletions test/systemtest/test_separate_pkgs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def test_pkg_one_correct_one_license_file_missing(self):
process, stdout = open_subprocess("test_pkg_one_correct_one_license_file_missing")
self.assertEqual(os.EX_DATAERR, process.returncode)
self.assertTrue(
check_output_status(stdout, WARNING, SUCCESS, WARNING, FAILURE, FAILURE, SUCCESS)
check_output_status(stdout, WARNING, SUCCESS, WARNING, FAILURE, SUCCESS, SUCCESS)
)

def test_pkg_scheme1_conform(self):
Expand Down Expand Up @@ -274,9 +274,10 @@ def test_pkg_with_multiple_licenses_one_referenced_incorrect(self):
"test_pkg_with_multiple_licenses_one_referenced_incorrect"
)
self.assertEqual(os.EX_OK, process.returncode)
print(stdout)
self.assertIn(b"WARNING Licenses ['BSD'] are not in SPDX list", stdout)
self.assertTrue(
check_output_status(stdout, WARNING, SUCCESS, WARNING, WARNING, WARNING, WARNING)
check_output_status(stdout, WARNING, SUCCESS, WARNING, WARNING, SUCCESS, WARNING)
)

def test_pkg_wrong_license_file(self):
Expand Down