Fix linter checks

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

scanpipe/api/serializers.py

@@ -30,8 +30,8 @@
 from scanpipe.models import CodebaseRelation
 from scanpipe.models import CodebaseResource
 from scanpipe.models import DiscoveredDependency
-from scanpipe.models import DiscoveredPackage
 from scanpipe.models import DiscoveredLicense
+from scanpipe.models import DiscoveredPackage
 from scanpipe.models import InputSource
 from scanpipe.models import Project
 from scanpipe.models import ProjectMessage

scanpipe/filters.py

@@ -38,8 +38,8 @@
 from scanpipe.models import CodebaseRelation
 from scanpipe.models import CodebaseResource
 from scanpipe.models import DiscoveredDependency
-from scanpipe.models import DiscoveredPackage
 from scanpipe.models import DiscoveredLicense
+from scanpipe.models import DiscoveredPackage
 from scanpipe.models import Project
 from scanpipe.models import ProjectMessage
 from scanpipe.models import Run

scanpipe/models.py

@@ -2685,14 +2685,10 @@ def with_resources_count(self):
         return self.annotate(resources_count=count_subquery)
 
     def has_license_detections(self):
-        return self.filter(
-            ~Q(license_detections=[]) | ~Q(other_license_detections=[])
-        )
+        return self.filter(~Q(license_detections=[]) | ~Q(other_license_detections=[]))
 
     def has_no_license_detections(self):
-        return self.filter(
-            Q(license_detections=[]) & Q(other_license_detections=[])
-        )
+        return self.filter(Q(license_detections=[]) & Q(other_license_detections=[]))
 
 
 class AbstractPackage(models.Model):
@@ -3454,39 +3450,39 @@ class AbstractLicenseDetection(models.Model):
     license_expression = models.TextField(
         blank=True,
         help_text=_(
-            'A license expression string using the SPDX license expression'
-            ' syntax and ScanCode license keys, the effective license expression'
-            ' for this license detection.'
+            "A license expression string using the SPDX license expression"
+            " syntax and ScanCode license keys, the effective license expression"
+            " for this license detection."
         ),
     )
 
     license_expression_spdx = models.TextField(
         blank=True,
-        help_text=_('SPDX license expression string with SPDX ids.'),
+        help_text=_("SPDX license expression string with SPDX ids."),
     )
 
     matches = models.JSONField(
         _("Reference Matches"),
         default=list,
         blank=True,
-        help_text=_('List of license matches combined in this detection.'),
+        help_text=_("List of license matches combined in this detection."),
     )
 
     detection_log = models.JSONField(
         default=list,
         blank=True,
         help_text=_(
-            'A list of detection DetectionRule explaining how '
-            'this detection was created.'
+            "A list of detection DetectionRule explaining how "
+            "this detection was created."
         ),
     )
 
     identifier = models.CharField(
         max_length=1024,
         blank=True,
         help_text=_(
-            'An identifier unique for a license detection, containing the license '
-            'expression and a UUID crafted from the match contents.'    
+            "An identifier unique for a license detection, containing the license "
+            "expression and a UUID crafted from the match contents."
         ),
     )
 
@@ -3502,10 +3498,11 @@ class DiscoveredLicense(
     AbstractLicenseDetection,
 ):
     """
-    A project's Discovered Licenses are the unique License Detection objects 
+    A project's Discovered Licenses are the unique License Detection objects
     discovered in the code under analysis.
 
     """
+
     license_expression_field = "license_expression"
 
     # If this license was discovered in a extracted license statement
@@ -3523,10 +3520,10 @@ class DiscoveredLicense(
         default=list,
         blank=True,
         help_text=_(
-            'A list of file regions with resource path, start and end line '
-            'details for each place this license detection was discovered at. '
-            'Also contains whether this license was discovered from a file or '
-            'from package metadata.'
+            "A list of file regions with resource path, start and end line "
+            "details for each place this license detection was discovered at. "
+            "Also contains whether this license was discovered from a file or "
+            "from package metadata."
         ),
     )
 
@@ -3554,9 +3551,10 @@ def __str__(self):
     @classmethod
     def create_from_data(cls, project, detection_data):
         """
-        Create and returns a DiscoveredLicense for a `project` from the `detection_data`.
-        If one of the values of the required fields is not available, a "ProjectMessage"
-        is created instead of a new DiscoveredLicense instance.
+        Create and returns a DiscoveredLicense for a `project` from the
+        `detection_data`. If one of the values of the required fields is not
+        available, a "ProjectMessage" is created instead of a new
+        DiscoveredLicense instance.
         """
         detection_data = detection_data.copy()
         required_fields = ["license_expression", "identifier", "matches"]
@@ -3572,7 +3570,11 @@ def create_from_data(cls, project, detection_data):
                 f"{', '.join(missing_values)}"
             )
 
-            project.add_warning(description=message, model=cls, details=detection_data)
+            project.add_warning(
+                description=message,
+                model=cls,
+                details=detection_data,
+            )
             return
 
         cleaned_data = {
@@ -3583,8 +3585,8 @@ def create_from_data(cls, project, detection_data):
 
         discovered_license = cls(project=project, **cleaned_data)
         # Using save_error=False to not capture potential errors at this level but
-        # rather in the CodebaseResource.create_and_add_license_data method so resource data
-        # can be injected in the ProjectMessage record.
+        # rather in the CodebaseResource.create_and_add_license_data method so
+        # resource data can be injected in the ProjectMessage record.
         discovered_license.save(save_error=False, capture_exception=False)
         return discovered_license
 
@@ -3594,7 +3596,7 @@ def update_with_file_region(self, file_region):
         `file_regions` list and increase the `detection_count` by 1.
         """
         file_region_data = file_region.to_dict()
-        if not file_region_data in self.file_regions:
+        if file_region_data not in self.file_regions:
             self.file_regions.append(file_region_data)
             if not self.detection_count:
                 self.detection_count = 1

scanpipe/pipes/__init__.py

@@ -36,8 +36,8 @@
 from scanpipe.models import CodebaseRelation
 from scanpipe.models import CodebaseResource
 from scanpipe.models import DiscoveredDependency
-from scanpipe.models import DiscoveredPackage
 from scanpipe.models import DiscoveredLicense
+from scanpipe.models import DiscoveredPackage
 from scanpipe.pipes import scancode
 
 logger = logging.getLogger("scanpipe.pipes")
@@ -239,7 +239,10 @@ def update_or_create_dependency(
 
 
 def update_or_create_license_detection(
-    project, detection_data, resource_path, from_package=False,
+    project,
+    detection_data,
+    resource_path,
+    from_package=False,
 ):
     """
     Get, update or create a DiscoveredLicense object then return it.

scanpipe/pipes/input.py

@@ -34,8 +34,8 @@
 from scanpipe.models import CodebaseRelation
 from scanpipe.models import CodebaseResource
 from scanpipe.models import DiscoveredDependency
-from scanpipe.models import DiscoveredPackage
 from scanpipe.models import DiscoveredLicense
+from scanpipe.models import DiscoveredPackage
 from scanpipe.pipes import scancode
 from scanpipe.pipes.output import mappings_key_by_fieldname
 

scanpipe/pipes/scancode.py

@@ -37,9 +37,9 @@
 from commoncode import fileutils
 from commoncode.resource import VirtualCodebase
 from extractcode import api as extractcode_api
+from licensedcode.detection import FileRegion
 from packagedcode import get_package_handler
 from packagedcode import models as packagedcode_models
-from licensedcode.detection import FileRegion
 from scancode import Scanner
 from scancode import api as scancode_api
 from scancode import cli as scancode_cli
@@ -450,12 +450,8 @@ def get_file_region(detection_data, resource_path):
     object containing information about where this license was detected
     exactly in a codebase, with `resource_path`, with start and end lines.
     """
-    start_line = min(
-        [match['start_line'] for match in detection_data["matches"]]
-    )
-    end_line = max(
-        [match['end_line'] for match in detection_data["matches"]]
-    )
+    start_line = min([match["start_line"] for match in detection_data["matches"]])
+    end_line = max([match["end_line"] for match in detection_data["matches"]])
     return FileRegion(
         path=resource_path,
         start_line=start_line,
@@ -680,7 +676,7 @@ def create_discovered_licenses(project, scanned_codebase):
     """
     Save the license detections of a ScanCode `scanned_codebase`
     scancode.resource.Codebase object to the database as a DiscoveredLicense of
-    `project`. 
+    `project`.
     """
     if hasattr(scanned_codebase.attributes, "license_detections"):
         for detection_data in scanned_codebase.attributes.license_detections:

scanpipe/views.py

@@ -64,8 +64,8 @@
 from scanpipe.api.serializers import DiscoveredDependencySerializer
 from scanpipe.filters import PAGE_VAR
 from scanpipe.filters import DependencyFilterSet
-from scanpipe.filters import PackageFilterSet
 from scanpipe.filters import LicenseFilterSet
+from scanpipe.filters import PackageFilterSet
 from scanpipe.filters import ProjectFilterSet
 from scanpipe.filters import ProjectMessageFilterSet
 from scanpipe.filters import RelationFilterSet
@@ -82,8 +82,8 @@
 from scanpipe.models import CodebaseRelation
 from scanpipe.models import CodebaseResource
 from scanpipe.models import DiscoveredDependency
-from scanpipe.models import DiscoveredPackage
 from scanpipe.models import DiscoveredLicense
+from scanpipe.models import DiscoveredPackage
 from scanpipe.models import InputSource
 from scanpipe.models import Project
 from scanpipe.models import ProjectMessage
@@ -1999,7 +1999,7 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["dependency_data"] = DiscoveredDependencySerializer(self.object).data
         return context
-    
+
 
 class DiscoveredLicenseDetailsView(
     ConditionalLoginRequired,