Merge latest

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

src/packagedcode/alpine.py

@@ -147,9 +147,9 @@ def parse_alpine_installed_db(location, datasource_id, package_type):
     """
     for package_fields in get_alpine_installed_db_fields(location):
         yield build_package_data(
+            package_fields=package_fields,
             datasource_id=datasource_id,
             package_type=package_type,
-            fields=package_fields,
         )
 
 

src/packagedcode/debian.py

@@ -574,7 +574,7 @@ def build_package_data(debian_data, datasource_id, package_type='deb', distro=No
             namespace=distro
         ).to_string()
 
-        source_packages.appmed(source_pkg_purl)
+        source_packages.append(source_pkg_purl)
 
     return models.PackageData(
         datasource_id=datasource_id,

src/packagedcode/maven.py

@@ -1033,7 +1033,7 @@ def get_parties(pom):
     return parties
 
 
-def get_urls(cls, namespace, name, version, qualifiers, base_url='http://repo1.maven.org/maven2'):
+def get_urls(namespace, name, version, qualifiers, base_url='http://repo1.maven.org/maven2'):
     """
     Return a mapping of URLs.
     """
@@ -1212,7 +1212,7 @@ def build_vcs_and_code_view_urls(scm):
     # TODO: handle tag
     # vcs_tag = scm.get('tag')
 
-    return dict(vcs_url=vcs_url, code_view_url=code_view_url)
+    return dict(vcs_url=vcs_url, code_view_url=code_view_url,)
 
 
 def parse_scm_connection(scm_connection):

src/packagedcode/models.py

@@ -906,9 +906,7 @@ def assemble(cls, package_data, resource, codebase):
             package_uid = package.package_uid
 
             if not package.license_expression:
-                package.license_expression = cls.compute_normalized_license(
-                    package=package,
-                )
+                package.license_expression = cls.compute_normalized_license(package)
 
             cls.assign_package_to_resources(
                 package=package,

tests/packagedcode/test_package_instance.py

@@ -50,29 +50,29 @@ def test_package_data_merge_generic(self, regen=REGEN_TEST_FIXTURES):
         expected_file = self.get_test_loc('instance/python-manifests-click-scanned-result.json')
 
         with io.open(input_file, encoding='utf-8') as res:
-            manifests = json.load(res)
+            packages_data = json.load(res)
 
         package = None
-        for pkg_data in manifests:
+        for package_data in packages_data:
             if not package:
-                package = models.Package.from_package_data(pkg_data, datafile_path='main')
+                package = models.Package.from_package_data(package_data, datafile_path='main')
             else:
-                package.update(pkg_data, datafile_path='foo/bar')
+                package.update(package_data, datafile_path='click')
 
-        self.check_package_data(package, expected_file, regen)
+        self.check_package_data(package.to_dict(), expected_file, regen)
 
     def test_package_data_merge_with_dependencies(self, regen=REGEN_TEST_FIXTURES):
         input_file = self.get_test_loc('instance/python-manifests-atomicwrites-scanned.json')
         expected_file = self.get_test_loc('instance/python-manifests-atomicwrites-scanned-result.json')
 
         with io.open(input_file, encoding='utf-8') as res:
-            manifests = json.load(res)
+            packages_data = json.load(res)
 
         package = None
-        for pkg_data in manifests:
+        for package_data in packages_data:
             if not package:
-                package = models.Package.from_package_data(pkg_data, datafile_path='main')
+                package = models.Package.from_package_data(package_data, datafile_path='main')
             else:
-                package.update(pkg_data, datafile_path='foo/bar')
+                package.update(package_data, datafile_path='atomicwrites')
 
-        self.check_package_data(package, expected_file, regen)
+        self.check_package_data(package.to_dict(), expected_file, regen)