Bump ScanCode toolkit to 31.0.0rc5

* also adjust tests accordingly

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

scanpipe/tests/data/is-npm-1.0.0_scan_codebase.json

@@ -58,6 +58,7 @@
         {
           "purl": "pkg:npm/ava",
           "scope": "devDependencies",
+          "extra_data": {},
           "is_runtime": false,
           "is_optional": true,
           "is_resolved": false,

scanpipe/tests/data/is-npm-1.0.0_scan_package.json

@@ -34,6 +34,7 @@
       "is_optional": true,
       "is_resolved": false,
       "resolved_package": {},
+      "extra_data": {},
       "dependency_uid": "pkg:npm/ava?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
       "datafile_path": "codebase/package/package.json",
@@ -356,7 +357,8 @@
               "is_runtime": false,
               "is_optional": true,
               "is_resolved": false,
-              "resolved_package": {}
+              "resolved_package": {},
+              "extra_data": {}
             }
           ],
           "repository_homepage_url": "https://www.npmjs.com/package/is-npm",

scanpipe/tests/data/is-npm-1.0.0_scan_package_summary.json

@@ -108,7 +108,6 @@
       "extension": ".json",
       "programming_language": "",
       "mime_type": "application/json",
-      "file_type": "JSON data",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
@@ -213,7 +212,6 @@
       "extension": ".md",
       "programming_language": "",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,

scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package.json

@@ -34,6 +34,7 @@
       "is_optional": true,
       "is_resolved": false,
       "resolved_package": {},
+      "extra_data": {},
       "dependency_uid": "pkg:npm/ava?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
       "datafile_path": "codebase/is-npm/package.json",
@@ -47,6 +48,7 @@
       "is_optional": true,
       "is_resolved": false,
       "resolved_package": {},
+      "extra_data": {},
       "dependency_uid": "pkg:npm/ava?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
       "datafile_path": "codebase/is-npm/node_modules/is-npm/package.json",
@@ -541,7 +543,8 @@
               "is_runtime": false,
               "is_optional": true,
               "is_resolved": false,
-              "resolved_package": {}
+              "resolved_package": {},
+              "extra_data": {}
             }
           ],
           "repository_homepage_url": "https://www.npmjs.com/package/is-npm",
@@ -813,7 +816,8 @@
               "is_runtime": false,
               "is_optional": true,
               "is_resolved": false,
-              "resolved_package": {}
+              "resolved_package": {},
+              "extra_data": {}
             }
           ],
           "repository_homepage_url": "https://www.npmjs.com/package/is-npm",

scanpipe/tests/data/multiple-is-npm-1.0.0_scan_package_summary.json

@@ -116,7 +116,6 @@
       "extension": ".json",
       "programming_language": "",
       "mime_type": "application/json",
-      "file_type": "JSON data",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
@@ -221,7 +220,6 @@
       "extension": ".md",
       "programming_language": "",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,

setup.cfg

@@ -70,7 +70,7 @@ install_requires =
     # Docker
     container_inspector==32.0.1
     # ScanCode-toolkit
-    scancode-toolkit[packages]==31.0.0rc4
+    scancode-toolkit[packages]==31.0.0rc5
     extractcode[full]==31.0.0
     commoncode==31.0.0b4
     # FetchCode