From 8eaa16daded6638dde06614d6b3a0eed90ab2854 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 11 Jul 2023 22:00:03 +0530 Subject: [PATCH] Upgrade ScanCode-toolkit to v32.0.6 (#806) Signed-off-by: Ayan Sinha Mahapatra --- .../data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json | 8 ++++---- scanpipe/tests/data/is-npm-1.0.0_scan_package.json | 2 +- .../tests/data/multiple-is-npm-1.0.0_scan_package.json | 4 ++-- .../data/multiple-is-npm-1.0.0_scan_package_summary.json | 2 +- setup.cfg | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scanpipe/tests/data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json b/scanpipe/tests/data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json index ef0af6617..e9b8663f3 100644 --- a/scanpipe/tests/data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json +++ b/scanpipe/tests/data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json @@ -96,7 +96,7 @@ "end_line": 1, "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE", "start_line": 1, - "matched_text": "['License :: OSI Approved :: MIT License']", + "matched_text": "- 'License :: OSI Approved :: MIT License'", "match_coverage": 100.0, "matched_length": 5, "rule_relevance": 100, @@ -193,7 +193,7 @@ "end_line": 1, "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE", "start_line": 1, - "matched_text": "['License :: OSI Approved :: MIT License']", + "matched_text": "- 'License :: OSI Approved :: MIT License'", "match_coverage": 100.0, "matched_length": 5, "rule_relevance": 100, @@ -526,7 +526,7 @@ "end_line": 1, "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE", "start_line": 1, - "matched_text": "['License :: OSI Approved :: MIT License']", + "matched_text": "- 'License :: OSI Approved :: MIT License'", "match_coverage": 100.0, "matched_length": 5, "rule_relevance": 100, @@ -910,7 +910,7 @@ "end_line": 1, "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE", "start_line": 1, - "matched_text": "['License :: OSI Approved :: MIT License']", + "matched_text": "- 'License :: OSI Approved :: MIT License'", "match_coverage": 100.0, "matched_length": 5, "rule_relevance": 100, diff --git a/scanpipe/tests/data/is-npm-1.0.0_scan_package.json b/scanpipe/tests/data/is-npm-1.0.0_scan_package.json index be6bc547f..01ab33594 100644 --- a/scanpipe/tests/data/is-npm-1.0.0_scan_package.json +++ b/scanpipe/tests/data/is-npm-1.0.0_scan_package.json @@ -19,7 +19,7 @@ "errors": [], "warnings": [], "extra_data": { - "spdx_license_list_version": "3.20", + "spdx_license_list_version": "3.21", "files_count": 3 } } diff --git a/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package.json b/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package.json index 1c4703aea..0a058b057 100644 --- a/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package.json +++ b/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package.json @@ -19,7 +19,7 @@ "errors": [], "warnings": [], "extra_data": { - "spdx_license_list_version": "3.20", + "spdx_license_list_version": "3.21", "files_count": 6 } } @@ -40,7 +40,7 @@ "other_license_expressions": [ { "value": null, - "count": 1 + "count": 2 } ], "other_holders": [ diff --git a/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package_summary.json b/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package_summary.json index 5861ad826..bcd1922a5 100644 --- a/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package_summary.json +++ b/scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package_summary.json @@ -14,7 +14,7 @@ "other_license_expressions": [ { "value": null, - "count": 1 + "count": 2 } ], "other_holders": [ diff --git a/setup.cfg b/setup.cfg index 9def76228..79a74df5a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,7 +71,7 @@ install_requires = # Docker container-inspector==32.0.1 # ScanCode-toolkit - scancode-toolkit[packages]==32.0.5rc3 + scancode-toolkit[packages]==32.0.6 extractcode[full]==31.0.0 commoncode==31.0.2 # FetchCode