Fix unit tests #1145

Signed-off-by: tdruez <tdruez@nexb.com>

pyproject.toml

@@ -35,4 +35,3 @@ max-complexity = 10
 [tool.ruff.lint.per-file-ignores]
 # Allow the usage of assert in the test_spdx file.
 "**/test_spdx.py*" = ["S101"]
-"scanpipe/pipes/spdx.py" = ["UP006", "UP035"]

scanpipe/pipes/spdx.py

@@ -27,7 +27,6 @@
 from dataclasses import field
 from datetime import datetime
 from pathlib import Path
-from typing import List  # Python 3.8 compatibility
 
 SPDX_SPEC_VERSION = "2.3"
 SPDX_LICENSE_LIST_VERSION = "3.20"
@@ -271,7 +270,7 @@ class ExtractedLicensingInfo:
 
     name: str = ""
     comment: str = ""
-    see_alsos: List[str] = field(default_factory=list)
+    see_alsos: list[str] = field(default_factory=list)
 
     def as_dict(self):
         """Return the data as a serializable dict."""
@@ -331,9 +330,9 @@ class Package:
     comment: str = ""
     license_comments: str = ""
 
-    checksums: List[Checksum] = field(default_factory=list)
-    external_refs: List[ExternalRef] = field(default_factory=list)
-    attribution_texts: List[str] = field(default_factory=list)
+    checksums: list[Checksum] = field(default_factory=list)
+    external_refs: list[ExternalRef] = field(default_factory=list)
+    attribution_texts: list[str] = field(default_factory=list)
 
     def as_dict(self):
         """Return the data as a serializable dict."""
@@ -426,18 +425,18 @@ class File:
 
     spdx_id: str
     name: str
-    checksums: List[Checksum] = field(default_factory=list)
+    checksums: list[Checksum] = field(default_factory=list)
 
     license_concluded: str = "NOASSERTION"
     copyright_text: str = "NOASSERTION"
-    license_in_files: List[str] = field(default_factory=list)
-    contributors: List[str] = field(default_factory=list)
+    license_in_files: list[str] = field(default_factory=list)
+    contributors: list[str] = field(default_factory=list)
     notice_text: str = ""
     # Supported values:
     # SOURCE | BINARY | ARCHIVE | APPLICATION | AUDIO | IMAGE | TEXT | VIDEO |
     # DOCUMENTATION | SPDX | OTHER
-    types: List[str] = field(default_factory=list)
-    attribution_texts: List[str] = field(default_factory=list)
+    types: list[str] = field(default_factory=list)
+    attribution_texts: list[str] = field(default_factory=list)
     comment: str = ""
     license_comments: str = ""
 
@@ -545,16 +544,16 @@ class Document:
     name: str
     namespace: str
     creation_info: CreationInfo
-    packages: List[Package]
+    packages: list[Package]
 
     spdx_id: str = "SPDXRef-DOCUMENT"
     version: str = SPDX_SPEC_VERSION
     data_license: str = "CC0-1.0"
     comment: str = ""
 
-    files: List[File] = field(default_factory=list)
-    extracted_licenses: List[ExtractedLicensingInfo] = field(default_factory=list)
-    relationships: List[Relationship] = field(default_factory=list)
+    files: list[File] = field(default_factory=list)
+    extracted_licenses: list[ExtractedLicensingInfo] = field(default_factory=list)
+    relationships: list[Relationship] = field(default_factory=list)
 
     def as_dict(self):
         """Return the SPDX document as a serializable dict."""

scanpipe/tests/test_models.py

@@ -2712,23 +2712,6 @@ def test_scanpipe_discovered_dependency_model_create_from_data(self):
         )
         self.assertEqual("pypi_sdist_pkginfo", dependency.datasource_id)
 
-        # Test field validation when using create_from_data
-        dependency_count = DiscoveredDependency.objects.count()
-        incomplete_data = dict(dependency_data1)
-        incomplete_data["dependency_uid"] = ""
-        self.assertIsNone(
-            DiscoveredDependency.create_from_data(project1, incomplete_data)
-        )
-        self.assertEqual(dependency_count, DiscoveredDependency.objects.count())
-        message = project1.projectmessages.latest("created_date")
-        self.assertEqual("DiscoveredDependency", message.model)
-        self.assertEqual(ProjectMessage.Severity.WARNING, message.severity)
-        expected_message = "No values for the following required fields: dependency_uid"
-        self.assertEqual(expected_message, message.description)
-        self.assertEqual(dependency_data1["purl"], message.details["purl"])
-        self.assertEqual("", message.details["dependency_uid"])
-        self.assertEqual("", message.traceback)
-
     def test_scanpipe_discovered_package_model_unique_package_uid_in_project(self):
         project1 = Project.objects.create(name="Analysis")