Modify DependentPackage Atrributes

Rename "requirement" to "extracted_requirement" and add new attribute
"resolved_package".

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/packagedcode/alpine.py

@@ -891,7 +891,7 @@ def D_dependencies_handler(value, dependencies=None, **kwargs):
         dependency = models.DependentPackage(
             purl=purl,
             scope=scope,
-            requirement=requirement,
+            extracted_requirement=requirement,
             is_resolved=is_resolved,
         )
         if dependency not in dependencies:

src/packagedcode/bower.py

@@ -114,7 +114,7 @@ def recognize(cls, location):
                 models.DependentPackage(
                     purl=PackageURL(type='bower', name=dep_name).to_string(),
                     scope='dependencies',
-                    requirement=requirement,
+                    extracted_requirement=requirement,
                     is_runtime=True,
                     is_optional=False,
                 )
@@ -126,7 +126,7 @@ def recognize(cls, location):
                 models.DependentPackage(
                     purl=PackageURL(type='bower', name=dep_name).to_string(),
                     scope='devDependencies',
-                    requirement=requirement,
+                    extracted_requirement=requirement,
                     is_runtime=False,
                     is_optional=True,
                 )

src/packagedcode/build_gradle.py

@@ -278,7 +278,7 @@ def build_package(cls, dependencies):
                     version=version
                 ).to_string(),
                 scope=scope,
-                requirement=version,
+                extracted_requirement=version,
                 is_runtime=is_runtime,
                 is_optional=is_optional,
             )

src/packagedcode/cargo.py

@@ -134,7 +134,7 @@ def recognize(cls, location):
                         name=dep.get('name'),
                         version=dep.get('version')
                     ).to_string(),
-                    requirement=dep.get('version'),
+                    extracted_requirement=dep.get('version'),
                     scope='dependency',
                     is_runtime=True,
                     is_optional=False,

src/packagedcode/chef.py

@@ -267,7 +267,7 @@ def build_package(cls, package_data):
             models.DependentPackage(
                 purl=PackageURL(type='chef', name=dependency_name).to_string(),
                 scope='dependencies',
-                requirement=requirement,
+                extracted_requirement=requirement,
                 is_runtime=True,
                 is_optional=False,
             )

src/packagedcode/cocoapods.py

@@ -217,7 +217,7 @@ def recognize(cls, location):
                         models.DependentPackage(
                             purl=purl,
                             scope='requires-dev',
-                            requirement=version,
+                            extracted_requirement=version,
                             is_runtime=False,
                             is_optional=True,
                             is_resolved=True,
@@ -237,7 +237,7 @@ def recognize(cls, location):
                     models.DependentPackage(
                         purl=purl,
                         scope='requires-dev',
-                        requirement=version,
+                        extracted_requirement=version,
                         is_runtime=False,
                         is_optional=True,
                         is_resolved=True,

src/packagedcode/conda.py

@@ -157,7 +157,7 @@ def recognize(cls, location):
                             models.DependentPackage(
                                 purl=PackageURL(
                                     type='conda', name=dependency).to_string(),
-                                requirement=requirement,
+                                extracted_requirement=requirement,
                                 scope='dependencies',
                                 is_runtime=True,
                                 is_optional=False,

src/packagedcode/cran.py

@@ -113,7 +113,7 @@ def recognize(cls, location):
                         models.DependentPackage(
                             purl=PackageURL(
                                 type='cran', name=dependency).to_string(),
-                            requirement=requirement,
+                            extracted_requirement=requirement,
                             scope='dependencies',
                             is_runtime=True,
                             is_optional=False,

src/packagedcode/golang.py

@@ -79,7 +79,7 @@ def recognize(cls, location):
             package_dependencies.append(
                 models.DependentPackage(
                     purl=gomod.purl(include_version=True),
-                    requirement=gomod.version,
+                    extracted_requirement=gomod.version,
                     scope='require',
                     is_runtime=True,
                     is_optional=False,
@@ -92,7 +92,7 @@ def recognize(cls, location):
             package_dependencies.append(
                 models.DependentPackage(
                     purl=gomod.purl(include_version=True),
-                    requirement=gomod.version,
+                    extracted_requirement=gomod.version,
                     scope='exclude',
                     is_runtime=True,
                     is_optional=False,
@@ -141,7 +141,7 @@ def recognize(cls, location):
             package_dependencies.append(
                 models.DependentPackage(
                     purl=gosum.purl(),
-                    requirement=gosum.version,
+                    extracted_requirement=gosum.version,
                     scope='dependency',
                     is_runtime=True,
                     is_optional=False,

src/packagedcode/maven.py

@@ -936,7 +936,7 @@ def get_dependencies(pom):
 
             dep_pack = models.DependentPackage(
                 purl=str(dpurl),
-                requirement=dversion,
+                extracted_requirement=dversion,
                 scope=scope,
                 is_runtime=is_runtime,
                 is_optional=is_optional,