Skip to content

Commit bdddec1

Browse files
committed
Fix the package list for compatibility with current ORT
Signed-off-by: tdruez <[email protected]>
1 parent e71ec1c commit bdddec1

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

scanpipe/pipes/ort.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
@dataclass
5050
class SourceArtifact:
5151
url: str
52-
hash: str = None
52+
# Cannot coerce empty String ("") to `org.ossreviewtoolkit.model.Hash` value
53+
# hash: str = None
5354

5455

5556
# private data class Vcs(
@@ -90,8 +91,10 @@ class Dependency:
9091
# labels: dict = field(default_factory=dict)
9192

9293
# Additions to the initial model:
93-
description: str = ""
94-
homepageUrl: str = ""
94+
# UnrecognizedPropertyException: Unrecognized field "description"
95+
# description: str = ""
96+
# UnrecognizedPropertyException: Unrecognized field "homepageUrl"
97+
# homepageUrl: str = ""
9598

9699

97100
# private data class PackageList(
@@ -102,7 +105,7 @@ class Dependency:
102105
@dataclass
103106
class PackageList:
104107
projectName: str
105-
projectVcs: Vcs = None
108+
projectVcs: Vcs = field(default_factory=Vcs)
106109
dependencies: list = field(default_factory=list)
107110

108111
def to_yaml(self):
@@ -124,8 +127,8 @@ def to_ort_package_list_yml(project):
124127
sourceArtifact=SourceArtifact(url=package.download_url),
125128
declaredLicenses=[package.get_declared_license_expression_spdx()],
126129
vcs=Vcs(url=package.vcs_url),
127-
description=package.description,
128-
homepageUrl=package.homepage_url,
130+
# description=package.description,
131+
# homepageUrl=package.homepage_url,
129132
)
130133
dependencies.append(dependency)
131134

0 commit comments

Comments
 (0)