diff --git a/docs/source/cli-reference/help-text-options.rst b/docs/source/cli-reference/help-text-options.rst index 5e7a7694601..4d5cdfcf8e0 100644 --- a/docs/source/cli-reference/help-text-options.rst +++ b/docs/source/cli-reference/help-text-options.rst @@ -154,8 +154,8 @@ The Following Help Text is displayed, i.e. This is the help text for Scancode Ve scans for key, top-level files. Key files are top- level codebase files such as COPYING, README and package manifests as reported by the --classify - option "is_legal", "is_readme", "is_manifest" and - "is_top_level" flags. + option "is_legal", "is_readme", "is_manifest", + "is_notice" and "is_top_level" flags. --tallies-with-details Compute tallies of license, copyright and other scans at the codebase level, keeping intermediate details at the file and directory level. @@ -639,7 +639,7 @@ The Following Text is displayed, i.e. This is the available plugins for Scancode required_plugins: options: help_group: post-scan, name: tallies_key_files: --tallies-key-files - help: Compute tallies for license, copyright and other scans for key, top-level files. Key files are top-level codebase files such as COPYING, README and package manifests as reported by the --classify option "is_legal", "is_readme", "is_manifest" and "is_top_level" flags. + help: Compute tallies for license, copyright and other scans for key, top-level files. Key files are top-level codebase files such as COPYING, README and package manifests as reported by the --classify option "is_legal", "is_readme", "is_manifest", "is_notice" and "is_top_level" flags. doc: Compute tallies of a scan at the codebase level for only key files. @@ -669,7 +669,7 @@ The Following Text is displayed, i.e. This is the available plugins for Scancode -------------------------------------------- Plugin: scancode_pre_scan:classify class: summarycode.classify_plugin:FileClassifier codebase_attributes: - resource_attributes: is_legal, is_manifest, is_readme, is_top_level, is_key_file + resource_attributes: is_legal, is_manifest, is_readme, is_top_level, is_key_file, is_notice sort_order: 30 required_plugins: options: diff --git a/docs/source/cli-reference/scan-options-post.rst b/docs/source/cli-reference/scan-options-post.rst index 01d305433af..e174e77466e 100644 --- a/docs/source/cli-reference/scan-options-post.rst +++ b/docs/source/cli-reference/scan-options-post.rst @@ -1018,6 +1018,7 @@ To see all plugins available via command line help, use ``--plugins``. - "is_readme" - "is_top_level" - "is_key_file" + - "is_notice" A key-file is a top-level file, that is either a legal (LICENSE/COPYING etc), manifest or a readme file. @@ -1087,6 +1088,7 @@ To see all plugins available via command line help, use ``--plugins``. "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "tallies": { "detected_license_expression": [ { diff --git a/docs/source/cli-reference/scan-options-pre.rst b/docs/source/cli-reference/scan-options-pre.rst index 3179f4ca98f..e8cbb99cc65 100644 --- a/docs/source/cli-reference/scan-options-pre.rst +++ b/docs/source/cli-reference/scan-options-pre.rst @@ -62,6 +62,7 @@ Pre-Scan Options - readme - top-level - manifest + - notice A manifest file in computing is a file containing metadata for a group of accompanying files that are part of a set or coherent unit. @@ -80,6 +81,7 @@ Pre-Scan Options "is_readme": true, "is_top_level": true, "is_key_file": true + "is_notice": false, } ---- diff --git a/docs/source/rst_snippets/post_scan_options.rst b/docs/source/rst_snippets/post_scan_options.rst index 865deb23523..ff7f367f052 100644 --- a/docs/source/rst_snippets/post_scan_options.rst +++ b/docs/source/rst_snippets/post_scan_options.rst @@ -53,9 +53,9 @@ All "Post-Scan" Options for key, top-level files, with occurrence counts. Key files are top-level codebase files such as COPYING, README and package manifests as reported - by the ``--classify`` option: "is_legal", - "is_readme", "is_manifest" and "is_top_level" - flags. + by the ``--classify`` option: "is_legal" + , "is_readme", "is_manifest", "is_notice" and + "is_top_level" flags. Sub-Option of: ``--classify`` and ``--summary``. diff --git a/src/summarycode/classify.py b/src/summarycode/classify.py index fa78cfdca56..f07e92c669e 100644 --- a/src/summarycode/classify.py +++ b/src/summarycode/classify.py @@ -91,6 +91,9 @@ def get_relative_path(root_path, path): 'readme', ) +NOTICE_STARTS_ENDS = ( + "notice", +) def check_resource_name_start_and_end(resource, STARTS_ENDS): """ @@ -111,6 +114,7 @@ def set_classification_flags(resource, _LEGAL=LEGAL_STARTS_ENDS, _MANIF=MANIFEST_ENDS, _README=README_STARTS_ENDS, + _NOTICE=NOTICE_STARTS_ENDS, ): """ Set classification flags on the `resource` Resource @@ -119,8 +123,9 @@ def set_classification_flags(resource, resource.is_legal = is_legal = check_resource_name_start_and_end(resource, _LEGAL) resource.is_readme = is_readme = check_resource_name_start_and_end(resource, _README) + resource.is_notice = is_notice = check_resource_name_start_and_end(resource, _NOTICE) # FIXME: this will never be picked up as this is NOT available in a pre-scan plugin has_package_data = bool(getattr(resource, 'package_data', False)) resource.is_manifest = is_manifest = path.endswith(_MANIF) or has_package_data - resource.is_key_file = (resource.is_top_level and (is_readme or is_legal or is_manifest)) + resource.is_key_file = (resource.is_top_level and (is_readme or is_legal or is_manifest or is_notice)) return resource diff --git a/src/summarycode/classify_plugin.py b/src/summarycode/classify_plugin.py index 59e46da70dc..64e69d04e38 100644 --- a/src/summarycode/classify_plugin.py +++ b/src/summarycode/classify_plugin.py @@ -75,7 +75,10 @@ class FileClassifier(PostScanPlugin): ('is_key_file', Boolean(help='True if this file is "top-level" file and either a ' - 'legal, readme or manifest file.')), + 'legal, notice, readme or manifest file.')), + + ('is_notice', + Boolean(help='True if this file is likely a notice file')), # ('is_doc', # Boolean(help='True if this file is likely a documentation file.')), diff --git a/src/summarycode/tallies.py b/src/summarycode/tallies.py index b488686ad00..9c26b410d1c 100644 --- a/src/summarycode/tallies.py +++ b/src/summarycode/tallies.py @@ -304,7 +304,7 @@ class KeyFilesTallies(PostScanPlugin): help='Compute tallies for license, copyright and other scans for key, ' 'top-level files. Key files are top-level codebase files such ' 'as COPYING, README and package manifests as reported by the ' - '--classify option "is_legal", "is_readme", "is_manifest" ' + '--classify option "is_legal", "is_readme", "is_manifest", "is_notice" ' 'and "is_top_level" flags.', help_group=POST_SCAN_GROUP, required_options=['classify', 'tallies'] diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml index f1d2b6a1904..5f2a201ab37 100644 --- a/tests/formattedcode/data/common/manifests-expected.yaml +++ b/tests/formattedcode/data/common/manifests-expected.yaml @@ -1934,6 +1934,7 @@ files: is_readme: no is_top_level: yes is_key_file: no + is_notice: no detected_license_expression: detected_license_expression_spdx: license_detections: [] @@ -1974,6 +1975,7 @@ files: is_readme: no is_top_level: yes is_key_file: no + is_notice: no detected_license_expression: detected_license_expression_spdx: license_detections: [] @@ -2092,6 +2094,7 @@ files: is_readme: no is_top_level: no is_key_file: no + is_notice: no detected_license_expression: cddl-1.0 detected_license_expression_spdx: CDDL-1.0 license_detections: @@ -2173,6 +2176,7 @@ files: is_readme: no is_top_level: yes is_key_file: no + is_notice: no detected_license_expression: detected_license_expression_spdx: license_detections: [] @@ -2390,6 +2394,7 @@ files: is_readme: no is_top_level: no is_key_file: no + is_notice: no detected_license_expression: apache-2.0 detected_license_expression_spdx: Apache-2.0 license_detections: @@ -2481,6 +2486,7 @@ files: is_readme: no is_top_level: yes is_key_file: no + is_notice: no detected_license_expression: detected_license_expression_spdx: license_detections: [] @@ -2631,6 +2637,7 @@ files: is_readme: no is_top_level: no is_key_file: no + is_notice: no detected_license_expression: mit detected_license_expression_spdx: MIT license_detections: @@ -2702,6 +2709,7 @@ files: is_readme: no is_top_level: yes is_key_file: no + is_notice: no detected_license_expression: detected_license_expression_spdx: license_detections: [] @@ -2935,6 +2943,7 @@ files: is_readme: no is_top_level: no is_key_file: no + is_notice: no detected_license_expression: lgpl-3.0 detected_license_expression_spdx: LGPL-3.0-only license_detections: diff --git a/tests/formattedcode/data/reuse/vb.json b/tests/formattedcode/data/reuse/vb.json index 7eafc26ccc3..4fa2d49820f 100644 --- a/tests/formattedcode/data/reuse/vb.json +++ b/tests/formattedcode/data/reuse/vb.json @@ -512,6 +512,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 33, "dirs_count": 10, "size_count": 1161083, @@ -552,6 +553,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -592,6 +594,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -632,6 +635,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 1, "dirs_count": 0, "size_count": 28103, @@ -672,6 +676,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -712,6 +717,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 14, "dirs_count": 2, "size_count": 241228, @@ -814,6 +820,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -926,6 +933,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -966,6 +974,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 5, "dirs_count": 0, "size_count": 54552, @@ -1074,6 +1083,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1164,6 +1174,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1266,6 +1277,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1356,6 +1368,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1468,6 +1481,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1508,6 +1522,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 7, "dirs_count": 0, "size_count": 152090, @@ -1616,6 +1631,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1724,6 +1740,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1832,6 +1849,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1878,6 +1896,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -1924,6 +1943,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -2026,6 +2046,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -2179,6 +2200,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -2219,6 +2241,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 16, "dirs_count": 5, "size_count": 268762, @@ -2359,6 +2382,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -2515,6 +2539,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -2702,6 +2727,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -2804,6 +2830,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -2944,6 +2971,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3084,6 +3112,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3124,6 +3153,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 1, "dirs_count": 0, "size_count": 13594, @@ -3242,6 +3272,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3282,6 +3313,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 4, "dirs_count": 0, "size_count": 14257, @@ -3334,6 +3366,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3474,6 +3507,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3564,6 +3598,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3789,6 +3824,7 @@ "is_readme": true, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3829,6 +3865,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 1, "dirs_count": 0, "size_count": 16413, @@ -3937,6 +3974,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -3977,6 +4015,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 0, "size_count": 23223, @@ -4081,6 +4120,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -4185,6 +4225,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -4225,6 +4266,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 0, "size_count": 9994, @@ -4327,6 +4369,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -4367,6 +4410,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, diff --git a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml index 7a82f48dc13..86222c1cb2d 100644 --- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml +++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml @@ -1013,6 +1013,7 @@ files: is_readme: no is_top_level: yes is_key_file: no + is_notice: no detected_license_expression: detected_license_expression_spdx: license_detections: [] @@ -1053,6 +1054,7 @@ files: is_readme: yes is_top_level: yes is_key_file: yes + is_notice: no detected_license_expression: apache-2.0 AND (apache-2.0 OR mit) detected_license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT) license_detections: @@ -1129,6 +1131,7 @@ files: is_readme: no is_top_level: yes is_key_file: yes + is_notice: no detected_license_expression: apache-2.0 detected_license_expression_spdx: Apache-2.0 license_detections: @@ -1338,6 +1341,7 @@ files: is_readme: no is_top_level: yes is_key_file: yes + is_notice: no detected_license_expression: mit detected_license_expression_spdx: MIT license_detections: @@ -1477,6 +1481,7 @@ files: is_readme: no is_top_level: no is_key_file: no + is_notice: no detected_license_expression: apache-2.0 detected_license_expression_spdx: Apache-2.0 license_detections: diff --git a/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json b/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json index e260e9005ef..b790f2a6ebb 100644 --- a/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json +++ b/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json @@ -705,6 +705,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit OR gpl-2.0", "detected_license_expression_spdx": "MIT OR GPL-2.0-only", "license_detections": [ @@ -832,6 +833,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -969,6 +971,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "(mit OR gpl-2.0-plus) AND gpl-2.0", "detected_license_expression_spdx": "(MIT OR GPL-2.0-or-later) AND GPL-2.0-only", "license_detections": [ @@ -1242,6 +1245,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit OR gpl-2.0", "detected_license_expression_spdx": "MIT OR GPL-2.0-only", "license_detections": [ diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt index 6def63b8893..1f8800bac30 100644 --- a/tests/scancode/data/help/help.txt +++ b/tests/scancode/data/help/help.txt @@ -125,8 +125,8 @@ Options: scans for key, top-level files. Key files are top- level codebase files such as COPYING, README and package manifests as reported by the --classify - option "is_legal", "is_readme", "is_manifest" and - "is_top_level" flags. + option "is_legal", "is_readme", "is_manifest", + "is_notice" and "is_top_level" flags. --tallies-with-details Compute tallies of license, copyright and other scans at the codebase level, keeping intermediate details at the file and directory level. diff --git a/tests/scancode/data/help/help_linux.txt b/tests/scancode/data/help/help_linux.txt index a6527a51f3d..6b65dc5342b 100644 --- a/tests/scancode/data/help/help_linux.txt +++ b/tests/scancode/data/help/help_linux.txt @@ -127,8 +127,8 @@ Options: scans for key, top-level files. Key files are top- level codebase files such as COPYING, README and package manifests as reported by the --classify - option "is_legal", "is_readme", "is_manifest" and - "is_top_level" flags. + option "is_legal", "is_readme", "is_manifest", + "is_notice" and "is_top_level" flags. --tallies-with-details Compute tallies of license, copyright and other scans at the codebase level, keeping intermediate details at the file and directory level. diff --git a/tests/scancode/data/virtual_idempotent/codebase.json b/tests/scancode/data/virtual_idempotent/codebase.json index f690267cee4..b737bb88545 100644 --- a/tests/scancode/data/virtual_idempotent/codebase.json +++ b/tests/scancode/data/virtual_idempotent/codebase.json @@ -622,6 +622,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -944,6 +945,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1019,6 +1021,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1094,6 +1097,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1164,6 +1168,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1239,6 +1244,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1505,6 +1511,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1623,6 +1630,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1702,6 +1710,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1875,6 +1884,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -1982,6 +1992,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": true, "tallies": { "detected_license_expression": [ @@ -2096,6 +2107,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2192,6 +2204,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2310,6 +2323,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2389,6 +2403,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2579,6 +2594,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2704,6 +2720,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2824,6 +2841,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2905,6 +2923,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -2992,6 +3011,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -3106,6 +3126,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -3258,6 +3279,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -3341,6 +3363,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -3564,6 +3587,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -3709,6 +3733,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -3852,6 +3877,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -3977,6 +4003,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4100,6 +4127,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4223,6 +4251,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4298,6 +4327,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4405,6 +4435,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4480,6 +4511,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4587,6 +4619,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4716,6 +4749,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -4812,6 +4846,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": true, "tallies": { "detected_license_expression": [ @@ -4976,6 +5011,7 @@ "is_readme": true, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5051,6 +5087,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5200,6 +5237,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5275,6 +5313,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5387,6 +5426,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5495,6 +5535,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5570,6 +5611,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5700,6 +5742,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ @@ -5775,6 +5818,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "is_generated": false, "tallies": { "detected_license_expression": [ diff --git a/tests/summarycode/data/classify/cli.expected.json b/tests/summarycode/data/classify/cli.expected.json index e27875aeb77..51fcea99acc 100644 --- a/tests/summarycode/data/classify/cli.expected.json +++ b/tests/summarycode/data/classify/cli.expected.json @@ -24,6 +24,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 8, "dirs_count": 1, "size_count": 0, @@ -53,6 +54,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -82,6 +84,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -111,6 +114,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -140,6 +144,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -169,6 +174,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 0, "size_count": 0, @@ -198,6 +204,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -227,6 +234,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -256,6 +264,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -285,6 +294,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, diff --git a/tests/summarycode/data/classify/notice/ATTRIBUTION_NOTICE.txt b/tests/summarycode/data/classify/notice/ATTRIBUTION_NOTICE.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/LICENSE-NOTICE.txt b/tests/summarycode/data/classify/notice/LICENSE-NOTICE.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/NOTICE b/tests/summarycode/data/classify/notice/NOTICE new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/NOTICE-APACHE.txt b/tests/summarycode/data/classify/notice/NOTICE-APACHE.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/NOTICE-LEGAL.TXT b/tests/summarycode/data/classify/notice/NOTICE-LEGAL.TXT new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/NOTICE-LEGAL.txt b/tests/summarycode/data/classify/notice/NOTICE-LEGAL.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/NOTICE-README.txt b/tests/summarycode/data/classify/notice/NOTICE-README.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/NOTICE.md b/tests/summarycode/data/classify/notice/NOTICE.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/NOTICE.txt b/tests/summarycode/data/classify/notice/NOTICE.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/PATENTS-NOTICE.txt b/tests/summarycode/data/classify/notice/PATENTS-NOTICE.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/THIRD_PARTY_NOTICE.txt b/tests/summarycode/data/classify/notice/THIRD_PARTY_NOTICE.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/notice/package_NOTICE.txt b/tests/summarycode/data/classify/notice/package_NOTICE.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/classify/with_package_data.expected.json b/tests/summarycode/data/classify/with_package_data.expected.json index 57930562d93..0bd761e517c 100644 --- a/tests/summarycode/data/classify/with_package_data.expected.json +++ b/tests/summarycode/data/classify/with_package_data.expected.json @@ -255,6 +255,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 7, "dirs_count": 7, "size_count": 31701, @@ -288,6 +289,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 5, "dirs_count": 3, "size_count": 27441, @@ -321,6 +323,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -354,6 +357,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -437,6 +441,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -470,6 +475,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 2, "size_count": 15229, @@ -503,6 +509,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 1, "size_count": 15229, @@ -536,6 +543,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 0, "size_count": 15229, @@ -614,6 +622,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -832,6 +841,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -865,6 +875,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 2, "size_count": 4260, @@ -898,6 +909,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 1, "size_count": 4260, @@ -931,6 +943,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 2, "dirs_count": 0, "size_count": 4260, @@ -964,6 +977,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, @@ -997,6 +1011,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "files_count": 0, "dirs_count": 0, "size_count": 0, diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json index 709f5e179fb..39330f2a8de 100644 --- a/tests/summarycode/data/score/basic-expected.json +++ b/tests/summarycode/data/score/basic-expected.json @@ -384,6 +384,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -425,6 +426,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -500,6 +502,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -795,6 +798,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json index 8e2de0e595b..5d8fcee9c94 100644 --- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json +++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json @@ -406,6 +406,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -447,6 +448,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -522,6 +524,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -817,6 +820,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -886,6 +890,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": "gpl-2.0-plus", "detected_license_expression_spdx": "GPL-2.0-or-later", "license_detections": [ diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json index fd905e27bde..25e964a586d 100644 --- a/tests/summarycode/data/score/jar-expected.json +++ b/tests/summarycode/data/score/jar-expected.json @@ -371,6 +371,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -412,6 +413,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -453,6 +455,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -494,6 +497,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -629,6 +633,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -670,6 +675,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -711,6 +717,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -752,6 +759,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -838,6 +846,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1064,6 +1073,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -1127,6 +1137,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1168,6 +1179,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1209,6 +1221,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1250,6 +1263,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -1325,6 +1339,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json index 443a8c80169..dd17e927317 100644 --- a/tests/summarycode/data/score/no_license_ambiguity-expected.json +++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json @@ -406,6 +406,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -445,6 +446,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -484,6 +486,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit OR apache-2.0", "detected_license_expression_spdx": "MIT OR Apache-2.0", "license_detections": [ @@ -747,6 +750,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit OR apache-2.0", "detected_license_expression_spdx": "MIT OR Apache-2.0", "license_detections": [ @@ -826,6 +830,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -887,6 +892,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -970,6 +976,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit OR apache-2.0", "detected_license_expression_spdx": "MIT OR Apache-2.0", "license_detections": [ @@ -1031,6 +1038,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1070,6 +1078,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], diff --git a/tests/summarycode/data/score/no_license_or_copyright-expected.json b/tests/summarycode/data/score/no_license_or_copyright-expected.json index 2051d53e21d..2fbf1c84663 100644 --- a/tests/summarycode/data/score/no_license_or_copyright-expected.json +++ b/tests/summarycode/data/score/no_license_or_copyright-expected.json @@ -294,6 +294,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -335,6 +336,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -376,6 +378,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -614,6 +617,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json index 71b73269bff..8818844a9cf 100644 --- a/tests/summarycode/data/score/no_license_text-expected.json +++ b/tests/summarycode/data/score/no_license_text-expected.json @@ -362,6 +362,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -403,6 +404,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -456,6 +458,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -717,6 +720,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ diff --git a/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json b/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json index 09cb9f607e6..79e1edabc9f 100644 --- a/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json +++ b/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json @@ -207,6 +207,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -246,6 +247,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -297,6 +299,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -358,6 +361,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -419,6 +423,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -458,6 +463,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -555,6 +561,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -594,6 +601,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus", "detected_license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later", "license_detections": [ diff --git a/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json b/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json index d72f6a3b731..5f349ac6675 100644 --- a/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json +++ b/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json @@ -284,6 +284,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -325,6 +326,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -398,6 +400,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -437,6 +440,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -478,6 +482,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "bsd-new", "detected_license_expression_spdx": "BSD-3-Clause", "license_detections": [ @@ -651,6 +656,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "bsd-new", "detected_license_expression_spdx": "BSD-3-Clause", "license_detections": [ @@ -873,6 +879,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], diff --git a/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json b/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json index 5e8a0f44945..b12ed3e5833 100644 --- a/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json +++ b/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json @@ -109,6 +109,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -148,6 +149,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -187,6 +189,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -226,6 +229,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -265,6 +269,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "gpl-3.0-plus", "detected_license_expression_spdx": "GPL-3.0-or-later", "license_detections": [ @@ -326,6 +331,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -365,6 +371,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -404,6 +411,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -443,6 +451,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -482,6 +491,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "gpl-2.0-plus", "detected_license_expression_spdx": "GPL-2.0-or-later", "license_detections": [ @@ -555,6 +565,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json index 175440f1f4b..5deb42b46e4 100644 --- a/tests/summarycode/data/summary/holders/clear_holder.expected.json +++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json @@ -145,6 +145,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -184,6 +185,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -281,6 +283,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -342,6 +345,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -403,6 +407,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -442,6 +447,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -529,6 +535,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -568,6 +575,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json index 725841b9ccd..b9229db18b9 100644 --- a/tests/summarycode/data/summary/holders/combined_holders.expected.json +++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json @@ -141,6 +141,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -180,6 +181,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -277,6 +279,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -338,6 +341,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -399,6 +403,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -438,6 +443,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -513,6 +519,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -552,6 +559,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json index 8b8cc425d3b..5feec2e7720 100644 --- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json @@ -109,6 +109,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -148,6 +149,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -199,6 +201,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -260,6 +263,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json index ac7d5abd69c..378055ccb1c 100644 --- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json @@ -141,6 +141,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -180,6 +181,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -267,6 +269,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -328,6 +331,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ diff --git a/tests/summarycode/data/summary/multiple_package_data/codebase/NOTICE b/tests/summarycode/data/summary/multiple_package_data/codebase/NOTICE new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json b/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json index 84ad322e3d2..d83830fbfc2 100644 --- a/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json +++ b/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json @@ -21,6 +21,10 @@ "value": "mit", "count": 2 }, + { + "value": null, + "count": 1 + }, { "value": "apache-2.0 AND (apache-2.0 OR mit)", "count": 1 @@ -29,7 +33,7 @@ "other_holders": [ { "value": null, - "count": 4 + "count": 5 } ], "other_languages": [] @@ -392,6 +396,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -400,11 +405,53 @@ "copyrights": [], "holders": [], "authors": [], - "files_count": 5, + "files_count": 6, "dirs_count": 0, "size_count": 11432, "scan_errors": [] }, + { + "path": "codebase/NOTICE", + "type": "file", + "name": "NOTICE", + "base_name": "NOTICE", + "extension": "", + "size": 0, + "sha1": null, + "md5": null, + "sha256": null, + "mime_type": "inode/x-empty", + "file_type": "empty", + "programming_language": null, + "is_binary": false, + "is_text": true, + "is_archive": false, + "is_media": false, + "is_source": false, + "is_script": false, + "package_data": [], + "for_packages": [ + "pkg:pypi/codebase?uuid=fixed-uid-done-for-testing-5642512d1758" + ], + "is_legal": true, + "is_manifest": false, + "is_readme": false, + "is_top_level": true, + "is_key_file": true, + "is_notice": true, + "detected_license_expression": null, + "detected_license_expression_spdx": null, + "license_detections": [], + "license_clues": [], + "percentage_of_license_text": 0, + "copyrights": [], + "holders": [], + "authors": [], + "files_count": 0, + "dirs_count": 0, + "size_count": 0, + "scan_errors": [] + }, { "path": "codebase/README.txt", "type": "file", @@ -433,6 +480,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -522,6 +570,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -662,6 +711,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -731,6 +781,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -870,6 +921,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ diff --git a/tests/summarycode/data/summary/single_file/single_file.expected.json b/tests/summarycode/data/summary/single_file/single_file.expected.json index a5b8517f8a5..dcf46e55534 100644 --- a/tests/summarycode/data/summary/single_file/single_file.expected.json +++ b/tests/summarycode/data/summary/single_file/single_file.expected.json @@ -69,6 +69,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -108,6 +109,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "jetty", "detected_license_expression_spdx": "LicenseRef-scancode-jetty", "license_detections": [ diff --git a/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json b/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json index 2355fb4d4cd..9226c63b803 100644 --- a/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json +++ b/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json @@ -356,6 +356,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -375,6 +376,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -394,6 +396,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -435,6 +438,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -454,6 +458,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -579,6 +584,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -679,6 +685,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -696,6 +703,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -937,6 +945,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -956,6 +965,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1073,6 +1083,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -1252,6 +1263,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -1305,6 +1317,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1322,6 +1335,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1341,6 +1355,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1360,6 +1375,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1379,6 +1395,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], diff --git a/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json b/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json index 6f54e573e68..df1612e93cd 100644 --- a/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json +++ b/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json @@ -174,6 +174,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -215,6 +216,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -355,6 +357,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ diff --git a/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json b/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json index 17dda5f5b24..4f442fb28c2 100644 --- a/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json +++ b/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json @@ -265,6 +265,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -306,6 +307,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -395,6 +397,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -458,6 +461,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ @@ -597,6 +601,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ diff --git a/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json b/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json index 10e22786572..f2993adc19d 100644 --- a/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json +++ b/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json @@ -141,6 +141,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -180,6 +181,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)", "detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)", "license_detections": [ @@ -267,6 +269,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "apache-2.0", "detected_license_expression_spdx": "Apache-2.0", "license_detections": [ @@ -328,6 +331,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "mit", "detected_license_expression_spdx": "MIT", "license_detections": [ diff --git a/tests/summarycode/data/tallies/copyright_tallies/tallies_key_files.expected.json b/tests/summarycode/data/tallies/copyright_tallies/tallies_key_files.expected.json index 0e6c485a189..9016700c1d6 100644 --- a/tests/summarycode/data/tallies/copyright_tallies/tallies_key_files.expected.json +++ b/tests/summarycode/data/tallies/copyright_tallies/tallies_key_files.expected.json @@ -168,6 +168,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -200,6 +201,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -232,6 +234,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -264,6 +267,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright 2005, JBoss Inc., and individual contributors", @@ -308,6 +312,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 2005 Brian Goetz and Tim Peierls", @@ -358,6 +363,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright 2010, Red Hat, Inc. and individual contributors", @@ -402,6 +408,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [ @@ -440,6 +447,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [ @@ -478,6 +486,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright 2009, Red Hat Middleware LLC, and individual contributors", @@ -522,6 +531,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [ @@ -560,6 +570,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -592,6 +603,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -624,6 +636,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2011 Mark Adler", @@ -668,6 +681,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2013 Jean-loup Gailly and Mark Adler", @@ -712,6 +726,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2013 Jean-loup Gailly", @@ -756,6 +771,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -788,6 +804,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -820,6 +837,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 2002-2004 Dmitriy Anisimkov", @@ -864,6 +882,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2011 Mark Adler", @@ -908,6 +927,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2013 Jean-loup Gailly and Mark Adler", @@ -952,6 +972,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2012 Jean-loup Gailly", @@ -996,6 +1017,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -1028,6 +1050,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 2004 by Henrik Ravn", @@ -1072,6 +1095,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright Henrik Ravn 2004", @@ -1116,6 +1140,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -1148,6 +1173,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant", @@ -1198,6 +1224,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -1230,6 +1257,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2008 Mark Adler", @@ -1274,6 +1302,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 2003 Mark Adler", @@ -1318,6 +1347,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [], "holders": [], "authors": [], @@ -1350,6 +1380,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1997 Christian Michelsen Research AS Advanced Computing", @@ -1394,6 +1425,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2013 Jean-loup Gailly and Mark Adler", @@ -1438,6 +1470,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly", @@ -1482,6 +1515,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "copyrights": [ { "copyright": "Copyright (c) 1995-2013 Jean-loup Gailly", diff --git a/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json b/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json index a372443b23c..6946fd2e1f3 100644 --- a/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json +++ b/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json @@ -138,6 +138,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -178,6 +179,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -218,6 +220,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -258,6 +261,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -298,6 +302,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "gpl-3.0-plus", "detected_license_expression_spdx": "GPL-3.0-or-later", "license_detections": [ @@ -362,6 +367,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -404,6 +410,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -444,6 +451,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -484,6 +492,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -524,6 +533,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "gpl-2.0-plus", "detected_license_expression_spdx": "GPL-2.0-or-later", "license_detections": [ @@ -600,6 +610,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines b/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines index 71e68b8f823..ab0f5f67df4 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines +++ b/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines @@ -523,6 +523,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -564,6 +565,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "cc0-1.0", "detected_license_expression_spdx": "CC0-1.0", "license_detections": [ @@ -627,6 +629,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "artistic-2.0", "detected_license_expression_spdx": "Artistic-2.0", "license_detections": [ @@ -696,6 +699,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -737,6 +741,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -778,6 +783,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -870,6 +876,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -945,6 +952,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1037,6 +1045,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1078,6 +1087,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1119,6 +1129,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "lgpl-2.1-plus", "detected_license_expression_spdx": "LGPL-2.1-or-later", "license_detections": [ @@ -1194,6 +1205,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "cc-by-2.5", "detected_license_expression_spdx": "CC-BY-2.5", "license_detections": [ @@ -1275,6 +1287,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "lgpl-2.1-plus", "detected_license_expression_spdx": "LGPL-2.1-or-later", "license_detections": [ @@ -1350,6 +1363,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1397,6 +1411,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1444,6 +1459,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "lgpl-2.1-plus", "detected_license_expression_spdx": "LGPL-2.1-or-later", "license_detections": [ @@ -1519,6 +1535,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1566,6 +1583,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1607,6 +1625,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1699,6 +1718,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1791,6 +1811,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1883,6 +1904,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1958,6 +1980,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2050,6 +2073,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2142,6 +2166,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2183,6 +2208,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "gpl-2.0-plus WITH ada-linking-exception", "detected_license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception", "license_detections": [ @@ -2258,6 +2284,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2299,6 +2326,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2352,6 +2380,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "boost-1.0", "detected_license_expression_spdx": "BSL-1.0", "license_detections": [ @@ -2427,6 +2456,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2468,6 +2498,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2549,6 +2580,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2590,6 +2622,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2665,6 +2698,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2740,6 +2774,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2781,6 +2816,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit-old-style", "detected_license_expression_spdx": "LicenseRef-scancode-mit-old-style", "license_detections": [ diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json index 82c3d19a740..bbe68112461 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json @@ -483,6 +483,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -520,6 +521,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -557,6 +559,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -594,6 +597,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "lgpl-2.1-plus", "detected_license_expression_spdx": "LGPL-2.1-or-later", "license_detections": [ @@ -665,6 +669,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "cc-by-2.5", "detected_license_expression_spdx": "CC-BY-2.5", "license_detections": [ @@ -742,6 +747,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "lgpl-2.1-plus", "detected_license_expression_spdx": "LGPL-2.1-or-later", "license_detections": [ @@ -813,6 +819,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -856,6 +863,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -899,6 +907,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "lgpl-2.1-plus", "detected_license_expression_spdx": "LGPL-2.1-or-later", "license_detections": [ @@ -970,6 +979,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1013,6 +1023,7 @@ "is_readme": true, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1050,6 +1061,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1087,6 +1099,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1175,6 +1188,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1246,6 +1260,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1334,6 +1349,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "cc0-1.0", "detected_license_expression_spdx": "CC0-1.0", "license_detections": [ @@ -1393,6 +1409,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": true, + "is_notice": false, "detected_license_expression": "artistic-2.0", "detected_license_expression_spdx": "Artistic-2.0", "license_detections": [ @@ -1458,6 +1475,7 @@ "is_readme": false, "is_top_level": true, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1495,6 +1513,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1532,6 +1551,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "gpl-2.0-plus WITH ada-linking-exception", "detected_license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception", "license_detections": [ @@ -1603,6 +1623,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1691,6 +1712,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1779,6 +1801,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -1867,6 +1890,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1904,6 +1928,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -1953,6 +1978,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "boost-1.0", "detected_license_expression_spdx": "BSL-1.0", "license_detections": [ @@ -2024,6 +2050,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2061,6 +2088,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2138,6 +2166,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2175,6 +2204,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2246,6 +2276,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2317,6 +2348,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": null, "detected_license_expression_spdx": null, "license_detections": [], @@ -2354,6 +2386,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "mit-old-style", "detected_license_expression_spdx": "LicenseRef-scancode-mit-old-style", "license_detections": [ @@ -2425,6 +2458,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2496,6 +2530,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ @@ -2584,6 +2619,7 @@ "is_readme": false, "is_top_level": false, "is_key_file": false, + "is_notice": false, "detected_license_expression": "zlib", "detected_license_expression_spdx": "Zlib", "license_detections": [ diff --git a/tests/summarycode/test_classify.py b/tests/summarycode/test_classify.py index 89a68d141eb..96ea6c300e6 100644 --- a/tests/summarycode/test_classify.py +++ b/tests/summarycode/test_classify.py @@ -64,6 +64,19 @@ def test_set_classification_flags_is_package_data_file(self): set_classification_flags(res) assert res.is_manifest + + def test_set_classification_flags_is_notice(self): + test_dir = self.get_test_loc('classify/notice') + codebase = Codebase( + test_dir, resource_attributes=FileClassifier.resource_attributes) + print(Codebase) + for res in codebase.walk(): + print(res) + if not res.is_file: + continue + set_classification_flags(res) + assert res.is_notice + def test_classify_cli_option(self): test_dir = self.get_test_loc('classify/cli') result_file = self.get_temp_file('json')