Update assemble methods

    * Update assemble methods for alpine and debian to yield Packages first before other items

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

src/packagedcode/alpine.py

@@ -81,16 +81,6 @@ def assemble(cls, package_data, resource, codebase, package_adder):
 
         package.license_expression = cls.compute_normalized_license(package)
 
-
-        dependent_packages = package_data.dependencies
-        if dependent_packages:
-            yield from models.Dependency.from_dependent_packages(
-                dependent_packages=dependent_packages,
-                datafile_path=resource.path,
-                datasource_id=package_data.datasource_id,
-                package_uid=package_uid,
-            )
-
         root_path = Path(root_resource.path)
         # a file ref extends from the root of the filesystem
         file_references_by_path = {
@@ -118,6 +108,15 @@ def assemble(cls, package_data, resource, codebase, package_adder):
         yield package
         yield from resources
 
+        dependent_packages = package_data.dependencies
+        if dependent_packages:
+            yield from models.Dependency.from_dependent_packages(
+                dependent_packages=dependent_packages,
+                datafile_path=resource.path,
+                datasource_id=package_data.datasource_id,
+                package_uid=package_uid,
+            )
+
 
 class AlpineApkbuildHandler(models.DatafileHandler):
     datasource_id = 'alpine_apkbuild'

src/packagedcode/debian.py

@@ -241,14 +241,18 @@ def assemble(cls, package_data, resource, codebase, package_adder):
         package_file_references.extend(package_data.file_references)
         package_uid = package.package_uid
 
+        dependencies = []
         dependent_packages = package_data.dependencies
         if dependent_packages:
-            yield from models.Dependency.from_dependent_packages(
-                dependent_packages=dependent_packages,
-                datafile_path=resource.path,
-                datasource_id=package_data.datasource_id,
-                package_uid=package_uid,
+            deps = list(
+                models.Dependency.from_dependent_packages(
+                    dependent_packages=dependent_packages,
+                    datafile_path=resource.path,
+                    datasource_id=package_data.datasource_id,
+                    package_uid=package_uid,
+                )
             )
+            dependencies.extend(deps)
 
         # Multi-Arch can be: "foreign", "same", "allowed", "all", "optional" or
         # empty/non-present. See https://wiki.debian.org/Multiarch/HOWTO
@@ -312,12 +316,15 @@ def assemble(cls, package_data, resource, codebase, package_adder):
             # yield possible dependencies
             dependent_packages = package_data.dependencies
             if dependent_packages:
-                yield from models.Dependency.from_dependent_packages(
-                    dependent_packages=dependent_packages,
-                    datafile_path=res.path,
-                    datasource_id=package_data.datasource_id,
-                    package_uid=package_uid,
+                deps = list(
+                    models.Dependency.from_dependent_packages(
+                        dependent_packages=dependent_packages,
+                        datafile_path=res.path,
+                        datasource_id=package_data.datasource_id,
+                        package_uid=package_uid,
+                    )
                 )
+                dependencies.extend(deps)
 
             resources.append(res)
 
@@ -353,6 +360,7 @@ def assemble(cls, package_data, resource, codebase, package_adder):
 
         yield package
         yield from resources
+        yield from dependencies
 
 
 class DebianDistrolessInstalledDatabaseHandler(models.DatafileHandler):