Skip to content

Commit 65e652d

Browse files
Update scancode-toolkit and fix tests
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent f3385a8 commit 65e652d

4 files changed

Lines changed: 11 additions & 13 deletions

File tree

scanpipe/tests/data/resolved_dependencies_inspect_packages.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,13 +1110,13 @@
11101110
}
11111111
],
11121112
"for_packages": [
1113-
"pkg:npm/create-athena-partition@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758",
1113+
"pkg:npm/athena-express@6.0.4?uuid=fixed-uid-done-for-testing-5642512d1758",
11141114
"pkg:npm/bluebird@3.7.2?uuid=fixed-uid-done-for-testing-5642512d1758",
1115+
"pkg:npm/create-athena-partition@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758",
11151116
"pkg:npm/csvtojson@2.0.10?uuid=fixed-uid-done-for-testing-5642512d1758",
1116-
"pkg:npm/athena-express@6.0.4?uuid=fixed-uid-done-for-testing-5642512d1758",
1117-
"pkg:npm/strip-bom@2.0.0?uuid=fixed-uid-done-for-testing-5642512d1758",
1117+
"pkg:npm/is-utf8@0.2.1?uuid=fixed-uid-done-for-testing-5642512d1758",
11181118
"pkg:npm/lodash@4.17.21?uuid=fixed-uid-done-for-testing-5642512d1758",
1119-
"pkg:npm/is-utf8@0.2.1?uuid=fixed-uid-done-for-testing-5642512d1758"
1119+
"pkg:npm/strip-bom@2.0.0?uuid=fixed-uid-done-for-testing-5642512d1758"
11201120
],
11211121
"emails": [],
11221122
"urls": [],

scanpipe/tests/test_pipelines.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,10 +481,12 @@ def _normalize_package_uids(self, data):
481481
):
482482
value = purl_with_fake_uuid(value)
483483
if key == "for_packages" and value:
484-
value = [
485-
self.purl_fields_with_fake_uuid(package_uid, key)
486-
for package_uid in value
487-
]
484+
value = sorted(
485+
[
486+
self.purl_fields_with_fake_uuid(package_uid, key)
487+
for package_uid in value
488+
]
489+
)
488490
if is_local_files and key in ("name", "namespace", "purl") and value:
489491
value = self.purl_fields_with_fake_uuid(value, key)
490492
normalized_data[key] = value

scanpipe/views.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,10 +1543,6 @@ class DiscoveredDependencyListView(
15431543
"field_name": "is_resolved",
15441544
"filter_fieldname": "is_resolved",
15451545
},
1546-
{
1547-
"field_name": "is_direct",
1548-
"filter_fieldname": "is_direct",
1549-
},
15501546
"for_package",
15511547
"resolved_to_package",
15521548
"datafile_resource",

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ install_requires =
7272
# Docker
7373
container-inspector==33.0.0
7474
# ScanCode-toolkit
75-
scancode-toolkit[packages] @ git+https://github.com/nexB/scancode-toolkit.git@ce8e0d1ddc9e8968958313e82481d46498d51f25
75+
scancode-toolkit[packages] @ git+https://github.com/nexB/scancode-toolkit.git@ae22b45d23122df13ff5d6907a9bb6e117c63026
7676
extractcode[full]==31.0.0
7777
commoncode==31.2.1
7878
# FetchCode

0 commit comments

Comments
 (0)