From f8e1a61f346e701986fca575409f6de684585ddc Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Mon, 12 Jun 2023 21:21:59 +0530 Subject: [PATCH 1/2] Bump scancode-toolkit to v32.0.5rc3 Signed-off-by: Ayan Sinha Mahapatra --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index cb3c2b5e21..850d822fd1 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.4 + scancode-toolkit[packages]==32.0.5rc3 extractcode[full]==31.0.0 commoncode==31.0.2 # FetchCode From e45cc70e85e3c2817b68ec2dc7c38c7a7f2e2813 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 29 Jun 2023 21:42:27 +0530 Subject: [PATCH 2/2] Regen test fixtures after SCTK upgrade Signed-off-by: Ayan Sinha Mahapatra --- scanpipe/tests/data/flume-ng-node-d2d.json | 8 +------ .../tests/data/is-npm-1.0.0_scan_package.json | 13 +++++++++++- .../multiple-is-npm-1.0.0_scan_package.json | 21 +++++++++++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/scanpipe/tests/data/flume-ng-node-d2d.json b/scanpipe/tests/data/flume-ng-node-d2d.json index c40fbc1db6..fa9e73291e 100644 --- a/scanpipe/tests/data/flume-ng-node-d2d.json +++ b/scanpipe/tests/data/flume-ng-node-d2d.json @@ -296,13 +296,7 @@ "percentage_of_license_text": null, "copyrights": [], "holders": [], - "authors": [ - { - "author": "Apache Maven", - "end_line": 1, - "start_line": 1 - } - ], + "authors": [], "package_data": [], "for_packages": [], "emails": [], 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 2a35391a1f..be6bc547f6 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 @@ -154,6 +154,11 @@ "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee", "license_expression": "mit", "detection_count": 2 + }, + { + "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf", + "license_expression": "mit", + "detection_count": 1 } ], "files": [ @@ -413,7 +418,13 @@ "percentage_of_license_text": 3.33, "copyrights": [], "holders": [], - "authors": [], + "authors": [ + { + "author": "Sindre Sorhus", + "start_line": 7, + "end_line": 8 + } + ], "emails": [ { "email": "sindresorhus@gmail.com", 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 1e0abf0c36..1c4703aea8 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 @@ -248,6 +248,11 @@ "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee", "license_expression": "mit", "detection_count": 4 + }, + { + "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf", + "license_expression": "mit", + "detection_count": 2 } ], "files": [ @@ -623,7 +628,13 @@ "percentage_of_license_text": 3.33, "copyrights": [], "holders": [], - "authors": [], + "authors": [ + { + "author": "Sindre Sorhus", + "start_line": 7, + "end_line": 8 + } + ], "emails": [ { "email": "sindresorhus@gmail.com", @@ -876,7 +887,13 @@ "percentage_of_license_text": 3.33, "copyrights": [], "holders": [], - "authors": [], + "authors": [ + { + "author": "Sindre Sorhus", + "start_line": 7, + "end_line": 8 + } + ], "emails": [ { "email": "sindresorhus@gmail.com",