Skip to content

Commit f818e62

Browse files
VarshaUNVarshaUN
committed
fix CI failures
Signed-off-by: Varsha U N <varshaun58@gmail.com>
1 parent 81942b6 commit f818e62

13 files changed

Lines changed: 72 additions & 49 deletions

‎scanpipe/forms.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,9 @@ def __init__(self, *args, **kwargs):
180180
self.fields["pipeline"].choices = pipeline_choices
181181

182182
self.fields["use_local_storage"].label = "Store packages locally"
183-
self.fields["use_local_storage"].help_text = "If checked, " \
184-
"packages will be stored on the local filesystem."
183+
self.fields["use_local_storage"].help_text = (
184+
"If checked, " "packages will be stored on the local filesystem."
185+
)
185186
self.fields["use_local_storage"].widget.attrs.update({"class": "checkbox"})
186187

187188
def clean_name(self):

‎scanpipe/models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,10 +598,10 @@ class Project(UUIDPKModel, ExtraDataFieldMixin, UpdateMixin, models.Model):
598598
),
599599
)
600600

601-
602601
labels = TaggableManager(through=UUIDTaggedItem)
603-
use_local_storage = models.BooleanField(default=False,
604-
help_text="Store packages locally if enabled.")
602+
use_local_storage = models.BooleanField(
603+
default=False, help_text="Store packages locally if enabled."
604+
)
605605
objects = ProjectQuerySet.as_manager()
606606

607607
class Meta:

‎scanpipe/pipelines/analyze_docker.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,29 +89,31 @@ def collect_and_create_codebase_resources(self):
8989
def store_package_archives(self):
9090
"""Store identified package archives."""
9191
if not self.project.use_local_storage:
92-
logger.info(f"Local storage is disabled for project: {self.project.name}."
93-
"Skipping package storage.")
94-
return []
92+
logger.info(
93+
f"Local storage is disabled for project: {self.project.name}."
94+
"Skipping package storage."
95+
)
96+
return []
9597

9698
logger.info(
97-
f"Storing package archives for project: {self.project.name},"
98-
"files: {self.package_files}"
99+
f"Storing package archives for project: {self.project.name},"
100+
"files: {self.package_files}"
99101
)
100102
stored_files = []
101103
for package_path in self.package_files:
102104
if not Path(package_path).exists():
103-
logger.error(f"Invalid or missing package path: {package_path}")
104-
continue
105+
logger.error(f"Invalid or missing package path: {package_path}")
106+
continue
105107
package_path_str = str(package_path)
106108
logger.info(f"Storing package archive: {package_path_str}")
107109
try:
108110
result = store_package_archive(
109-
self.project, url=None, file_path=package_path_str
111+
self.project, url=None, file_path=package_path_str
110112
)
111113
logger.info(f"Stored package archive {package_path_str}: {result}")
112114
stored_files.append(result)
113115
except Exception as e:
114-
logger.error(f"Failed to store {package_path_str}: {e}")
116+
logger.error(f"Failed to store {package_path_str}: {e}")
115117
return stored_files
116118

117119
def collect_and_create_system_packages(self):

‎scanpipe/pipelines/analyze_docker_windows.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
from scanpipe.pipes.input import is_archive
3232

3333
logger = logging.getLogger(__name__)
34+
35+
3436
class DockerWindows(Docker):
3537
"""Analyze Windows Docker images."""
3638

@@ -59,8 +61,10 @@ def steps(cls):
5961
def store_package_archives(self):
6062
"""Store identified package archives for Windows images."""
6163
if not self.project.use_local_storage:
62-
logger.info(f"Local storage is disabled for project: {self.project.name}."
63-
"Skipping package storage.")
64+
logger.info(
65+
f"Local storage is disabled for project: {self.project.name}."
66+
"Skipping package storage."
67+
)
6468
return []
6569

6670
logger.info(f"Storing package archives for project: {self.project.name}")

‎scanpipe/pipelines/analyze_root_filesystem.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,11 @@ def store_package_archives(self):
9999
them for detected system packages if configured to do so.
100100
"""
101101
if not self.project.use_local_storage:
102-
self.log(f"Local storage is disabled for project: {self.project.name}."
103-
"Skipping package storage.")
104-
return []
102+
self.log(
103+
f"Local storage is disabled for project: {self.project.name}."
104+
"Skipping package storage."
105+
)
106+
return []
105107
if not self.env.get("STORE_DOWNLOADED_PACKAGES", True):
106108
self.log("Package storage skipped: STORE_DOWNLOADED_PACKAGES is disabled")
107109
return

‎scanpipe/pipelines/deploy_to_develop.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
logger = logging.getLogger(__name__)
4040

41+
4142
class DeployToDevelop(Pipeline):
4243
"""
4344
Establish relationships between two code trees: deployment and development.
@@ -105,7 +106,6 @@ def steps(cls):
105106
cls.create_local_files_packages,
106107
)
107108

108-
109109
purldb_package_extensions = [".jar", ".war", ".zip"]
110110
purldb_resource_extensions = [
111111
".map",
@@ -138,7 +138,8 @@ def store_package_archives(self):
138138
if not self.project.use_local_storage:
139139
logger.info(
140140
f"Local storage is disabled for project: {self.project.name}."
141-
"Skipping package storage.")
141+
"Skipping package storage."
142+
)
142143
return []
143144

144145
logger.info(f"Storing package archives for project: {self.project.name}")

‎scanpipe/pipelines/inspect_packages.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
logger = logging.getLogger(__name__)
3030

31+
3132
class InspectPackages(ScanCodebase):
3233
"""
3334
Inspect a codebase for packages and pre-resolved dependencies.
@@ -69,7 +70,6 @@ def scan_for_application_packages(self):
6970
progress_logger=self.log,
7071
)
7172

72-
7373
@group("StaticResolver")
7474
def resolve_dependencies(self):
7575
"""

‎scanpipe/pipelines/load_inventory.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
logger = logging.getLogger(__name__)
3131

32+
3233
class LoadInventory(Pipeline):
3334
"""
3435
Load JSON/XLSX inventory files generated with ScanCode-toolkit or ScanCode.io.
@@ -56,8 +57,10 @@ def get_inputs(self):
5657
def store_inventory_files(self):
5758
"""Store input inventory files locally if enabled."""
5859
if not self.project.use_local_storage:
59-
logger.info(f"Local storage is disabled for project: {self.project.name}."
60-
"Skipping file storage.")
60+
logger.info(
61+
f"Local storage is disabled for project: {self.project.name}."
62+
"Skipping file storage."
63+
)
6164
return []
6265

6366
logger.info(f"Storing inventory files for project: {self.project.name}")

‎scanpipe/pipelines/load_sbom.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
logger = logging.getLogger(__name__)
3131

32+
3233
class LoadSBOM(ScanCodebase):
3334
"""
3435
Load package data from one or more SBOMs.
@@ -62,8 +63,10 @@ def get_sbom_inputs(self):
6263
def store_sbom_files(self):
6364
"""Store SBOM files locally if enabled."""
6465
if not self.project.use_local_storage:
65-
logger.info(f"Local storage is disabled for project: {self.project.name}."
66-
"Skipping file storage.")
66+
logger.info(
67+
f"Local storage is disabled for project: {self.project.name}."
68+
"Skipping file storage."
69+
)
6770
return []
6871

6972
logger.info(f"Storing SBOM files for project: {self.project.name}")

‎scanpipe/pipelines/resolve_dependencies.py‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
from scanpipe.pipes.input import is_archive
3333

3434
logger = logging.getLogger(__name__)
35+
36+
3537
class ResolveDependencies(ScanCodebase):
3638
"""
3739
Resolve dependencies from package manifests and lockfiles.
@@ -55,7 +57,7 @@ def steps(cls):
5557
cls.get_manifest_inputs,
5658
cls.store_manifest_files,
5759
cls.scan_for_application_packages,
58-
cls.store_package_archives,
60+
cls.store_package_archives,
5961
cls.create_packages_and_dependencies,
6062
cls.get_packages_from_manifest,
6163
cls.create_resolved_packages,
@@ -68,8 +70,10 @@ def get_manifest_inputs(self):
6870
def store_manifest_files(self):
6971
"""Store manifest files locally if enabled."""
7072
if not self.project.use_local_storage:
71-
logger.info(f"Local storage is disabled for project: {self.project.name}."
72-
"Skipping file storage.")
73+
logger.info(
74+
f"Local storage is disabled for project: {self.project.name}."
75+
"Skipping file storage."
76+
)
7377
return []
7478

7579
logger.info(f"Storing manifest files for project: {self.project.name}")
@@ -93,7 +97,6 @@ def store_manifest_files(self):
9397

9498
return stored_files
9599

96-
97100
@group("StaticResolver")
98101
def scan_for_application_packages(self):
99102
"""
@@ -110,8 +113,10 @@ def scan_for_application_packages(self):
110113
def store_package_archives(self):
111114
"""Store package archives locally if enabled."""
112115
if not self.project.use_local_storage:
113-
logger.info(f"Local storage is disabled for project: {self.project.name}."
114-
"Skipping package storage.")
116+
logger.info(
117+
f"Local storage is disabled for project: {self.project.name}."
118+
"Skipping package storage."
119+
)
115120
return []
116121

117122
logger.info(f"Storing package archives for project: {self.project.name}")

0 commit comments

Comments
 (0)