Skip to content

Commit 1667ea1

Browse files
committed
Update data_type of license_clarity_score attribute to dict and few minor changes
Signed-off-by: swastik <swastkk@gmail.com>
1 parent 703d7cc commit 1667ea1

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/packagedcode/models.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,11 +1531,7 @@ class Package(PackageData):
15311531
help='List of the datasource ids used to create this package.'
15321532
)
15331533

1534-
license_clarity_score = List(
1535-
item_type=dict,
1536-
label='License Clarity Information',
1537-
help='List containing the license clarity score and related elements.'
1538-
)
1534+
license_clarity_score = attr.ib(default=attr.Factory(dict))
15391535

15401536
def __attrs_post_init__(self, *args, **kwargs):
15411537
if not self.package_uid:

src/packagedcode/plugin_package.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,14 @@ class PackageSummary(PostScanPlugin):
279279
"""
280280
Summary at the Package Level.
281281
"""
282-
run_order = 8
283-
sort_order= 8
282+
run_order = 11
283+
sort_order= 11
284284

285285
options = [
286286
PluggableCommandLineOption(('--package-summary',),
287287
is_flag=True, default=False,
288-
help='Generate Package Level summary',
288+
help='Summarize scans by providing License Clarity Score at the '
289+
'Package attribute level.',
289290
help_group=POST_SCAN_GROUP)
290291
]
291292

@@ -379,7 +380,7 @@ def get_installed_packages(root_dir, processes=2, **kwargs):
379380
yield from packages_by_uid.values()
380381

381382

382-
def create_package_and_deps(codebase, package_summary ,package_adder=add_to_package, strip_root=False, **kwargs):
383+
def create_package_and_deps(codebase, package_summary= False ,package_adder=add_to_package, strip_root=False, **kwargs):
383384
"""
384385
Create and save top-level Package and Dependency from the parsed
385386
package data present in the codebase.
@@ -390,8 +391,10 @@ def create_package_and_deps(codebase, package_summary ,package_adder=add_to_pack
390391
strip_root=strip_root,
391392
**kwargs
392393
)
393-
394-
codebase.attributes.packages.extend(package.to_dict(package_summary) for package in packages)
394+
codebase.attributes.packages.extend(
395+
package.to_dict(package_summary= package_summary)
396+
for package in packages
397+
)
395398
codebase.attributes.dependencies.extend(dep.to_dict() for dep in dependencies)
396399

397400

0 commit comments

Comments
 (0)