From 1ae45ec49ab5a4409f30a784ebd946534aca1b54 Mon Sep 17 00:00:00 2001 From: tdruez Date: Fri, 5 Dec 2025 09:49:55 +0400 Subject: [PATCH 1/2] Upgrade scancode-toolkit to latest v32.4.1 release Signed-off-by: tdruez --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 84361de377..d297a53869 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,9 +58,9 @@ dependencies = [ # Docker "container-inspector==33.0.0", # ScanCode-toolkit - "scancode-toolkit[packages]==32.4.0", + "scancode-toolkit[packages]==32.4.1", "extractcode[full]==31.0.0", - "commoncode==32.3.0", + "commoncode==32.4.0", "Beautifulsoup4[chardet]==4.13.4", "packageurl-python==0.17.6", # Workaround issue https://github.com/aboutcode-org/scancode.io/issues/1795 From d030eab3f455ac13ce8a8452a0e7a77b51eace31 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 11 Dec 2025 22:17:51 +0530 Subject: [PATCH 2/2] Rollback commoncode version and regen test fixtures Signed-off-by: Ayan Sinha Mahapatra --- pyproject.toml | 2 +- scanpipe/tests/data/d2d/flume-ng-node-d2d.json | 2 +- scanpipe/tests/data/docker/centos_scan_codebase.json | 8 ++++---- .../manifests/openpdf-parent-1.3.11_scan_package.json | 2 +- .../tests/data/scancode/is-npm-1.0.0_scan_package.json | 2 +- .../data/scancode/multiple-is-npm-1.0.0_scan_package.json | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d297a53869..005995cf12 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ dependencies = [ # ScanCode-toolkit "scancode-toolkit[packages]==32.4.1", "extractcode[full]==31.0.0", - "commoncode==32.4.0", + "commoncode==32.3.0", "Beautifulsoup4[chardet]==4.13.4", "packageurl-python==0.17.6", # Workaround issue https://github.com/aboutcode-org/scancode.io/issues/1795 diff --git a/scanpipe/tests/data/d2d/flume-ng-node-d2d.json b/scanpipe/tests/data/d2d/flume-ng-node-d2d.json index 9fb4567f29..fa244308b7 100644 --- a/scanpipe/tests/data/d2d/flume-ng-node-d2d.json +++ b/scanpipe/tests/data/d2d/flume-ng-node-d2d.json @@ -4014,4 +4014,4 @@ "from_resource": "from/flume-ng-node-1.9.0-sources.jar-extract/org/apache/flume/node/StaticZooKeeperConfigurationProvider.java" } ] -} +} \ No newline at end of file diff --git a/scanpipe/tests/data/docker/centos_scan_codebase.json b/scanpipe/tests/data/docker/centos_scan_codebase.json index 770d4cf5cd..cd0f9d9ad3 100644 --- a/scanpipe/tests/data/docker/centos_scan_codebase.json +++ b/scanpipe/tests/data/docker/centos_scan_codebase.json @@ -155984,14 +155984,14 @@ "start_line": 1, "matched_text": "license pubkey", "match_coverage": 100.0, - "matched_length": 1, + "matched_length": 2, "rule_relevance": 100, "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7", "license_expression": "unknown", "license_expression_spdx": "LicenseRef-scancode-unknown" } ], - "identifier": "unknown-215a841a-e3aa-2ed9-9dfb-b6db7f0096e1", + "identifier": "unknown-6638c8ac-18c2-ed3f-78bb-1c72e6cc0939", "license_expression": "unknown", "license_expression_spdx": "LicenseRef-scancode-unknown" } @@ -156058,14 +156058,14 @@ "start_line": 1, "matched_text": "license pubkey", "match_coverage": 100.0, - "matched_length": 1, + "matched_length": 2, "rule_relevance": 100, "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7", "license_expression": "unknown", "license_expression_spdx": "LicenseRef-scancode-unknown" } ], - "identifier": "unknown-215a841a-e3aa-2ed9-9dfb-b6db7f0096e1", + "identifier": "unknown-6638c8ac-18c2-ed3f-78bb-1c72e6cc0939", "license_expression": "unknown", "license_expression_spdx": "LicenseRef-scancode-unknown" } diff --git a/scanpipe/tests/data/manifests/openpdf-parent-1.3.11_scan_package.json b/scanpipe/tests/data/manifests/openpdf-parent-1.3.11_scan_package.json index eab30481fb..407aa07b06 100644 --- a/scanpipe/tests/data/manifests/openpdf-parent-1.3.11_scan_package.json +++ b/scanpipe/tests/data/manifests/openpdf-parent-1.3.11_scan_package.json @@ -23,7 +23,7 @@ "errors": [], "warnings": [], "extra_data": { - "spdx_license_list_version": "3.26", + "spdx_license_list_version": "3.27", "files_count": 1 } } diff --git a/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_package.json b/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_package.json index 6636558fc7..180cad213e 100644 --- a/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_package.json +++ b/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_package.json @@ -23,7 +23,7 @@ "errors": [], "warnings": [], "extra_data": { - "spdx_license_list_version": "3.26", + "spdx_license_list_version": "3.27", "files_count": 3 } } diff --git a/scanpipe/tests/data/scancode/multiple-is-npm-1.0.0_scan_package.json b/scanpipe/tests/data/scancode/multiple-is-npm-1.0.0_scan_package.json index 498915297f..7dd1163eb8 100644 --- a/scanpipe/tests/data/scancode/multiple-is-npm-1.0.0_scan_package.json +++ b/scanpipe/tests/data/scancode/multiple-is-npm-1.0.0_scan_package.json @@ -23,7 +23,7 @@ "errors": [], "warnings": [], "extra_data": { - "spdx_license_list_version": "3.26", + "spdx_license_list_version": "3.27", "files_count": 6 } }