Update scancode-toolkit and fix tests

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
aboutcode-org · Jun 19, 2024 · ddead3b · ddead3b
1 parent f3385a8
commit ddead3b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/scanpipe/tests/data/resolved_dependencies_inspect_packages.json b/scanpipe/tests/data/resolved_dependencies_inspect_packages.json
@@ -1110,13 +1110,13 @@
         }
       ],
       "for_packages": [
-        "pkg:npm/create-athena-partition@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "pkg:npm/athena-express@6.0.4?uuid=fixed-uid-done-for-testing-5642512d1758",
         "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
         "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
-        "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
-        "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
         "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
-        "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
+        "pkg:npm/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
       "emails": [],
       "urls": [],

diff --git a/scanpipe/tests/test_pipelines.py b/scanpipe/tests/test_pipelines.py
@@ -481,10 +481,10 @@ def _normalize_package_uids(self, data):
                 ):
                     value = purl_with_fake_uuid(value)
                 if key == "for_packages" and value:
-                    value = [
+                    value = sorted([
                         self.purl_fields_with_fake_uuid(package_uid, key)
                         for package_uid in value
-                    ]
+                    ])
                 if is_local_files and key in ("name", "namespace", "purl") and value:
                     value = self.purl_fields_with_fake_uuid(value, key)
                 normalized_data[key] = value

diff --git a/scanpipe/views.py b/scanpipe/views.py
@@ -1543,10 +1543,6 @@ class DiscoveredDependencyListView(
             "field_name": "is_resolved",
             "filter_fieldname": "is_resolved",
         },
-        {
-            "field_name": "is_direct",
-            "filter_fieldname": "is_direct",
-        },
         "for_package",
         "resolved_to_package",
         "datafile_resource",