diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 60aed28016a..2a7251d430b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -238,7 +238,7 @@ Summary Plugin Update - The summary plugin's behavior has been changed. Previously, it provided a count of the detected license expressions, copyrights, holders, authors, and - programming languages from a scan. + programming languages from a scan. We have preserved this functionality by creating a new plugin called ``tallies``. All functionality of the previous summary plugin have been preserved in the @@ -248,7 +248,7 @@ Summary Plugin Update declared holder, and the primary programming language from a scan. And the updated license clarity score provides context on the quality of the license information provided in the codebase key files. - + - The new summary plugin also returns lists of tallies for the other "secondary" detected license expressions, copyright holders, and programming languages. @@ -273,11 +273,31 @@ Scancode Data Output Version is now 2.0.0. Changes: -- rename resource level attribute `packages` to `package_data`. -- add top-level attribute `packages`. -- add top-level attribute `dependencies`. -- add resource-level attribute `for_packages`. -- remove `package-data` attribute `root_path`. +- Rename resource level attribute `packages` to `package_data`. +- Add top-level attribute `packages`. +- Add top-level attribute `dependencies`. +- Add resource-level attribute `for_packages`. +- Remove `package-data` attribute `root_path`. +- The fields of the license clarity scoring plugin have been replaced with the + following fields. An overview of the new fields can be found in the "License + Clarity Scoring Update" section above. + - `score` + - `declared_license` + - `identification_precision` + - `has_license_text` + - `declared_copyrights` + - `conflicting_license_categories` + - `ambigious_compound_licensing` +- The fields of the summary plugin have been replaced with the following fields. + An overview of the new fields can be found in the "Summary Plugin Update" + section above. + - `declared_license_expression` + - `license_clarity_score` + - `declared_holder` + - `primary_language` + - `other_license_expressions` + - `other_holders` + - `other_languages` Documentation Update diff --git a/src/summarycode/score.py b/src/summarycode/score.py index bb4f701cc03..9f755dd716b 100644 --- a/src/summarycode/score.py +++ b/src/summarycode/score.py @@ -148,8 +148,8 @@ def compute_license_score(codebase): if scoring_elements.declared_license: scoring_elements.score += 40 - scoring_elements.precise_license_detection = check_declared_licenses(declared_licenses) - if scoring_elements.precise_license_detection: + scoring_elements.identification_precision = check_declared_licenses(declared_licenses) + if scoring_elements.identification_precision: scoring_elements.score += 40 scoring_elements.has_license_text = check_for_license_texts(declared_licenses) @@ -203,7 +203,7 @@ def unique(objects): class ScoringElements: score = attr.ib(default=0) declared_license = attr.ib(default=False) - precise_license_detection = attr.ib(default=False) + identification_precision = attr.ib(default=False) has_license_text = attr.ib(default=False) declared_copyrights = attr.ib(default=False) conflicting_license_categories = attr.ib(default=False) @@ -213,7 +213,7 @@ def to_dict(self): return { 'score': self.score, 'declared_license': self.declared_license, - 'precise_license_detection': self.precise_license_detection, + 'identification_precision': self.identification_precision, 'has_license_text': self.has_license_text, 'declared_copyrights': self.declared_copyrights, 'conflicting_license_categories': self.conflicting_license_categories, diff --git a/tests/summarycode/data/classify/cli.expected.json b/tests/summarycode/data/classify/cli.expected.json index 0505aa71093..e27875aeb77 100644 --- a/tests/summarycode/data/classify/cli.expected.json +++ b/tests/summarycode/data/classify/cli.expected.json @@ -1,31 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--info": true, - "--json-pp": "" - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 8 - } - } - ], "files": [ { "path": "cli", diff --git a/tests/summarycode/data/facet/cli.expected.json b/tests/summarycode/data/facet/cli.expected.json index b932c62310e..57502703d28 100644 --- a/tests/summarycode/data/facet/cli.expected.json +++ b/tests/summarycode/data/facet/cli.expected.json @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--facet": [ - "dev=*.c", - "tests=*/tests/*", - "data=*.json", - "docs=*/docs/*" - ], - "--json-pp": "" - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 56 - } - } - ], "files": [ { "path": "cli", diff --git a/tests/summarycode/data/generated/cli.expected.json b/tests/summarycode/data/generated/cli.expected.json index 61595db8447..1f19fee0695 100644 --- a/tests/summarycode/data/generated/cli.expected.json +++ b/tests/summarycode/data/generated/cli.expected.json @@ -1,30 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--generated": true, - "--json-pp": "" - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 7 - } - } - ], "files": [ { "path": "simple", diff --git a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json index 765a4fef9dd..64b5314a613 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 8 - } - } - ], "dependencies": [], "packages": [ { diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json index 45d9d6999c1..09b9c9d8c32 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json @@ -1,60 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 7 - } - }, - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--from-json": true, - "--json": "" - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 7 - } - } - ], "dependencies": [], "packages": [ { diff --git a/tests/summarycode/data/plugin_consolidate/e2fsprogs-expected.json b/tests/summarycode/data/plugin_consolidate/e2fsprogs-expected.json index c61e13629ca..77491ea9510 100644 --- a/tests/summarycode/data/plugin_consolidate/e2fsprogs-expected.json +++ b/tests/summarycode/data/plugin_consolidate/e2fsprogs-expected.json @@ -1,58 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": [ - "e2fsprogs-1.45.4" - ], - "--copyright": true, - "--email": true, - "--info": true, - "--json-pp": "e2fsprogs-1.45.4-a-no-configure.json", - "--license": true, - "--max-in-memory": 0, - "--package": true, - "--processes": "6", - "--url": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": null, - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "files_count": 2183 - } - }, - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--from-json": true, - "--json": "" - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 2183 - } - } - ], "consolidated_components": [ { "type": "holders", diff --git a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json index 1a5b829c6ab..35c4c630048 100644 --- a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json +++ b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "dependencies": [], "packages": [], "consolidated_components": [ diff --git a/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json b/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json index a213e3092ad..36bab7b381a 100644 --- a/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json +++ b/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 2 - } - } - ], "dependencies": [], "packages": [], "consolidated_components": [ diff --git a/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json b/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json index 9d1bfabd021..447a1b04ceb 100644 --- a/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 6 - } - } - ], "dependencies": [], "packages": [ { diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json index a07eaf5b705..f9f2561634f 100644 --- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 4 - } - } - ], "dependencies": [], "packages": [ { diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json index f483d0c0f39..f97f78375de 100644 --- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 1 - } - } - ], "dependencies": [], "packages": [ { diff --git a/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json b/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json index 045afdf150c..c3de066d12f 100644 --- a/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json +++ b/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 4 - } - } - ], "dependencies": [], "packages": [], "consolidated_components": [ diff --git a/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json b/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json index 6eec7b38aa9..b6d30b4526c 100644 --- a/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json +++ b/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json @@ -1,36 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--package": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 4 - } - } - ], "dependencies": [], "packages": [], "consolidated_components": [ diff --git a/tests/summarycode/data/plugin_consolidate/zlib-expected.json b/tests/summarycode/data/plugin_consolidate/zlib-expected.json index 636fd462e27..f8d54ab8ee1 100644 --- a/tests/summarycode/data/plugin_consolidate/zlib-expected.json +++ b/tests/summarycode/data/plugin_consolidate/zlib-expected.json @@ -1,58 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": [ - "zlib-1.2.11" - ], - "--copyright": true, - "--email": true, - "--info": true, - "--json-pp": "zlib-1.2.11-clipeu.json", - "--license": true, - "--max-in-memory": 0, - "--package": true, - "--processes": "4", - "--url": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": null, - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "files_count": 253 - } - }, - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--consolidate": true, - "--from-json": true, - "--json": "" - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [ - "The --consolidate option will be deprecated in a future version of scancode-toolkit." - ], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 253 - } - } - ], "consolidated_components": [ { "type": "holders", diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json index 63f44d1b9f0..e6fc7dc61a7 100644 --- a/tests/summarycode/data/score/basic-expected.json +++ b/tests/summarycode/data/score/basic-expected.json @@ -1,40 +1,10 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--license-clarity-score": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "summary": { "declared_license_expression": "mit", "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json index fe562fd9e04..36acc6182d3 100644 --- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json +++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json @@ -1,40 +1,10 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--license-clarity-score": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 4 - } - } - ], "summary": { "declared_license_expression": "mit", "license_clarity_score": { "score": 80, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": true, diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json index 0aeef4fb3ab..40da38cef22 100644 --- a/tests/summarycode/data/score/no_license_ambiguity-expected.json +++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json @@ -1,40 +1,10 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--license-clarity-score": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 8 - } - } - ], "summary": { "declared_license_expression": "mit OR apache-2.0", "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, 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 e94bcd1a071..e2f06dc4bc7 100644 --- a/tests/summarycode/data/score/no_license_or_copyright-expected.json +++ b/tests/summarycode/data/score/no_license_or_copyright-expected.json @@ -1,40 +1,10 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--license-clarity-score": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "summary": { "declared_license_expression": "", "license_clarity_score": { "score": 0, "declared_license": false, - "precise_license_detection": false, + "identification_precision": false, "has_license_text": false, "declared_copyrights": false, "conflicting_license_categories": false, diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json index 3b14ba18e7c..32ce1fa6924 100644 --- a/tests/summarycode/data/score/no_license_text-expected.json +++ b/tests/summarycode/data/score/no_license_text-expected.json @@ -1,40 +1,10 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json": "", - "--license": true, - "--license-clarity-score": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "summary": { "declared_license_expression": "mit", "license_clarity_score": { "score": 90, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": false, "declared_copyrights": true, "conflicting_license_categories": false, 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 7fa434ba1b6..3b5dbaf7234 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 @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 5 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 70, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": true, 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 f65b38b046f..58380936d36 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 @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 4 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 90, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": false, "conflicting_license_categories": false, diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json index 74c9f5e588c..d211fc179a6 100644 --- a/tests/summarycode/data/summary/holders/clear_holder.expected.json +++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 5 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json index 5cfac30528c..6a82546d0ae 100644 --- a/tests/summarycode/data/summary/holders/combined_holders.expected.json +++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 5 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json index 7284b40780c..3f37ce64fb5 100644 --- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 90, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json index b6720623181..deb4e738777 100644 --- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, 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 3aaa756b8c9..d293d8772c3 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 @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 5 - } - } - ], "dependencies": [], "packages": [ { @@ -136,7 +105,7 @@ "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, 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 bd4f6309127..d8404f98e06 100644 --- a/tests/summarycode/data/summary/single_file/single_file.expected.json +++ b/tests/summarycode/data/summary/single_file/single_file.expected.json @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 1 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, 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 d1e5dbe1b30..4181d14ee50 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 @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 4 - } - } - ], "dependencies": [], "packages": [ { @@ -88,7 +57,7 @@ "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, 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 bef224aa9d3..22a54e9aa61 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 @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--summary": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "dependencies": [], "packages": [], "summary": { @@ -37,7 +6,7 @@ "license_clarity_score": { "score": 100, "declared_license": true, - "precise_license_detection": true, + "identification_precision": true, "has_license_text": true, "declared_copyrights": true, "conflicting_license_categories": false, diff --git a/tests/summarycode/data/tallies/copyright_tallies/tallies.expected.json b/tests/summarycode/data/tallies/copyright_tallies/tallies.expected.json index fc6bd72a4c3..ac0cec441df 100644 --- a/tests/summarycode/data/tallies/copyright_tallies/tallies.expected.json +++ b/tests/summarycode/data/tallies/copyright_tallies/tallies.expected.json @@ -1,31 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--json-pp": "", - "--tallies": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 24 - } - } - ], "tallies": { "copyrights": [ { diff --git a/tests/summarycode/data/tallies/copyright_tallies/tallies2.expected.json b/tests/summarycode/data/tallies/copyright_tallies/tallies2.expected.json index 377e2b1ffa8..adad73c3ffe 100644 --- a/tests/summarycode/data/tallies/copyright_tallies/tallies2.expected.json +++ b/tests/summarycode/data/tallies/copyright_tallies/tallies2.expected.json @@ -1,31 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--json-pp": "", - "--tallies": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 1 - } - } - ], "tallies": { "copyrights": [ { diff --git a/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected.json b/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected.json index 02ac9f684ef..8b8e8e2142d 100644 --- a/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected.json +++ b/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected.json @@ -1,31 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--json-pp": "", - "--tallies-with-details": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 24 - } - } - ], "tallies": { "copyrights": [ { diff --git a/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected2.json b/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected2.json index cc0a8047ce2..8b8e8e2142d 100644 --- a/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected2.json +++ b/tests/summarycode/data/tallies/copyright_tallies/tallies_details.expected2.json @@ -1,31 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--json": "", - "--tallies-with-details": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 24 - } - } - ], "tallies": { "copyrights": [ { 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 8df7119189b..f34a3363f24 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 @@ -1,34 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--tallies": true, - "--tallies-key-files": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 24 - } - } - ], "tallies": { "copyrights": [ { 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 f34b9c797e3..5be47d7c4d6 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 @@ -1,39 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--facet": [ - "dev=*.java" - ], - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--tallies": true, - "--tallies-key-files": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 4 - } - } - ], "dependencies": [], "packages": [], "tallies": { diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json index 0c8032c7f86..bf6e0df2b25 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json @@ -1,34 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--tallies": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 26 - } - } - ], "dependencies": [ { "purl": "pkg:npm/abbrev", diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json index c16e1e97bdd..483863a2243 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json @@ -1,45 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--email": true, - "--facet": [ - "dev=*.java", - "dev=*.cs", - "dev=*ada*", - "data=*.S", - "tests=*infback9*", - "docs=*README" - ], - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--tallies": true, - "--tallies-by-facet": true, - "--url": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 26 - } - } - ], "dependencies": [ { "purl": "pkg:npm/abbrev", diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json index 2e9fc776159..67c1f004173 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json @@ -1,34 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--package": true, - "--tallies-with-details": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 26 - } - } - ], "dependencies": [ { "purl": "pkg:npm/abbrev", 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 125be46aad7..2d4fbc95e39 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 @@ -1,35 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--classify": true, - "--copyright": true, - "--info": true, - "--json-pp": "", - "--license": true, - "--tallies": true, - "--tallies-key-files": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 26 - } - } - ], "tallies": { "license_expressions": [ { diff --git a/tests/summarycode/data/tallies/packages/expected.json b/tests/summarycode/data/tallies/packages/expected.json index 1dda28b96a7..e9839df8b0e 100644 --- a/tests/summarycode/data/tallies/packages/expected.json +++ b/tests/summarycode/data/tallies/packages/expected.json @@ -1,31 +1,4 @@ { - "headers": [ - { - "tool_name": "scancode-toolkit", - "options": { - "input": "", - "--json-pp": "", - "--package": true, - "--tallies": true - }, - "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "2.0.0", - "message": null, - "errors": [], - "warnings": [], - "extra_data": { - "system_environment": { - "operating_system": "linux", - "cpu_architecture": "64", - "platform": "Linux-5.4.0-109-generic-x86_64-with-Ubuntu-18.04-bionic", - "platform_version": "#123~18.04.1-Ubuntu SMP Fri Apr 8 09:48:52 UTC 2022", - "python_version": "3.6.9 (default, Mar 15 2022, 13:55:28) \n[GCC 8.4.0]" - }, - "spdx_license_list_version": "3.16", - "files_count": 3 - } - } - ], "dependencies": [ { "purl": "pkg:npm/%40angular-devkit/build-optimizer",