Skip to content

Commit 62a29ac

Browse files
committed
Fix code/doc formatting #1763
Signed-off-by: Chin Yeung Li <tli@nexb.com>
1 parent 90c71dd commit 62a29ac

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

scanpipe/pipelines/scan_maven_package.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ def fetch_and_scan_remote_pom(self):
172172
self.project.add_error(
173173
description="\n".join(errors),
174174
model=self.pipeline_name,
175-
details={"resource_path": resource_reference.removeprefix("codebase/")},
175+
details={
176+
"resource_path": resource_reference.removeprefix("codebase/")
177+
},
176178
)
177179

178180
def update_package_license_from_resource_if_missing(self):

scanpipe/pipes/maven.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,15 @@ def update_package_license_from_resource_if_missing(project):
190190
"""Populate missing licenses to packages based on resource data."""
191191
for package in project.discoveredpackages.all():
192192
if not package.get_declared_license_expression():
193-
matching_resources = project.codebaseresources.has_license_expression().filter(
194-
discovered_packages=package
193+
matching_resources = (
194+
project.codebaseresources.has_license_expression().filter(
195+
discovered_packages=package
196+
)
195197
)
196198
detected_licenses = list(
197-
matching_resources.values_list("detected_license_expression", flat=True).distinct()
199+
matching_resources.values_list(
200+
"detected_license_expression", flat=True
201+
).distinct()
198202
)
199203
if detected_licenses:
200204
license_expression = " AND ".join(detected_licenses)

scanpipe/tests/pipes/test_maven.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ def test_scanpipe_maven_fetch_and_scan_remote_pom_no_pom_url(
223223
result = maven.fetch_and_scan_remote_pom(
224224
"pkg:maven/org/test@1.0", "/path/to/output.json"
225225
)
226-
self.assertEqual(result, [{"pkg:maven/org/test@1.0": ["Failed to resolve POM URL."]}])
226+
self.assertEqual(
227+
result, [{"pkg:maven/org/test@1.0": ["Failed to resolve POM URL."]}]
228+
)
227229

228230
@mock.patch("builtins.open", new_callable=mock.mock_open)
229231
@mock.patch("json.load")
@@ -239,10 +241,16 @@ def test_scanpipe_maven_fetch_and_scan_remote_pom_no_pom_file(
239241
result = maven.fetch_and_scan_remote_pom(
240242
"pkg:maven/org/test@1.0", "/path/to/output.json"
241243
)
242-
self.assertEqual(result, [{"https://example.com/test.pom": ["Failed to download the POM file."]}])
244+
self.assertEqual(
245+
result,
246+
[{"https://example.com/test.pom": ["Failed to download the POM file."]}],
247+
)
243248

244249
def test_update_scan_data(self):
245-
original_data = {"packages": [{"name": "package1"}], "dependencies": [{"name": "dep1"}]}
250+
original_data = {
251+
"packages": [{"name": "package1"}],
252+
"dependencies": [{"name": "dep1"}],
253+
}
246254
new_package = [{"name": "package2"}]
247255
new_dependency = [{"name": "dep2"}]
248256

0 commit comments

Comments
 (0)