Skip to content

Commit d8fe7c3

Browse files
committed
Remove dependencies from DiscoveredPackage #447
* This is to reflect the changes made to the Package model in scancode-toolkit * Update test expectations Signed-off-by: Jono Yang <[email protected]>
1 parent 56b948b commit d8fe7c3

16 files changed

+1802
-604
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Generated by Django 4.0.6 on 2022-07-28 23:13
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('scanpipe', '0020_concat_codebaseresource_name_and_extension'),
10+
]
11+
12+
operations = [
13+
migrations.RemoveField(
14+
model_name='discoveredpackage',
15+
name='dependencies',
16+
),
17+
migrations.AlterField(
18+
model_name='codebaseresource',
19+
name='name',
20+
field=models.CharField(blank=True, help_text='File or directory name of this resource with its extension.', max_length=255),
21+
),
22+
]

scanpipe/models.py

-5
Original file line numberDiff line numberDiff line change
@@ -1808,11 +1808,6 @@ class DiscoveredPackage(
18081808
)
18091809
missing_resources = models.JSONField(default=list, blank=True)
18101810
modified_resources = models.JSONField(default=list, blank=True)
1811-
dependencies = models.JSONField(
1812-
default=list,
1813-
blank=True,
1814-
help_text=_("A list of dependencies for this package."),
1815-
)
18161811
package_uid = models.CharField(
18171812
max_length=1024,
18181813
blank=True,

scanpipe/tests/data/alpine_3_15_4_scan_codebase.json

-14
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
},
161161
"missing_resources": [],
162162
"modified_resources": [],
163-
"dependencies": [],
164163
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
165164
"keywords": [],
166165
"source_packages": [
@@ -349,7 +348,6 @@
349348
},
350349
"missing_resources": [],
351350
"modified_resources": [],
352-
"dependencies": [],
353351
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
354352
"keywords": [],
355353
"source_packages": [
@@ -383,7 +381,6 @@
383381
"extra_data": {},
384382
"missing_resources": [],
385383
"modified_resources": [],
386-
"dependencies": [],
387384
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
388385
"keywords": [],
389386
"source_packages": [
@@ -428,7 +425,6 @@
428425
},
429426
"missing_resources": [],
430427
"modified_resources": [],
431-
"dependencies": [],
432428
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
433429
"keywords": [],
434430
"source_packages": [
@@ -473,7 +469,6 @@
473469
},
474470
"missing_resources": [],
475471
"modified_resources": [],
476-
"dependencies": [],
477472
"package_uid": "pkg:alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
478473
"keywords": [],
479474
"source_packages": [
@@ -542,7 +537,6 @@
542537
},
543538
"missing_resources": [],
544539
"modified_resources": [],
545-
"dependencies": [],
546540
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
547541
"keywords": [],
548542
"source_packages": [
@@ -576,7 +570,6 @@
576570
"extra_data": {},
577571
"missing_resources": [],
578572
"modified_resources": [],
579-
"dependencies": [],
580573
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
581574
"keywords": [],
582575
"source_packages": [
@@ -621,7 +614,6 @@
621614
},
622615
"missing_resources": [],
623616
"modified_resources": [],
624-
"dependencies": [],
625617
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
626618
"keywords": [],
627619
"source_packages": [
@@ -666,7 +658,6 @@
666658
},
667659
"missing_resources": [],
668660
"modified_resources": [],
669-
"dependencies": [],
670661
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
671662
"keywords": [],
672663
"source_packages": [
@@ -711,7 +702,6 @@
711702
},
712703
"missing_resources": [],
713704
"modified_resources": [],
714-
"dependencies": [],
715705
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
716706
"keywords": [],
717707
"source_packages": [
@@ -745,7 +735,6 @@
745735
"extra_data": {},
746736
"missing_resources": [],
747737
"modified_resources": [],
748-
"dependencies": [],
749738
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
750739
"keywords": [],
751740
"source_packages": [
@@ -779,7 +768,6 @@
779768
"extra_data": {},
780769
"missing_resources": [],
781770
"modified_resources": [],
782-
"dependencies": [],
783771
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
784772
"keywords": [],
785773
"source_packages": [
@@ -813,7 +801,6 @@
813801
"extra_data": {},
814802
"missing_resources": [],
815803
"modified_resources": [],
816-
"dependencies": [],
817804
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
818805
"keywords": [],
819806
"source_packages": [
@@ -858,7 +845,6 @@
858845
},
859846
"missing_resources": [],
860847
"modified_resources": [],
861-
"dependencies": [],
862848
"package_uid": "pkg:alpine/[email protected]?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758",
863849
"keywords": [],
864850
"source_packages": [

0 commit comments

Comments
 (0)