Modify package classes to inherit PackageManifest mixin

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

Author: AyanSinhaMahapatra

src/packagedcode/__init__.py

@@ -102,15 +102,16 @@
 if len(PACKAGE_MANIFESTS_BY_TYPE) != len(PACKAGE_MANIFEST_TYPES):
     seen_types = {}
     for pmt in PACKAGE_MANIFEST_TYPES:
-        assert pmt.default_type
-        seen = seen_types.get(pmt.default_type)
+        manifest = pmt()
+        assert manifest.package_manifest_type
+        seen = seen_types.get(manifest.package_manifest_type)
         if seen:
             msg = ('Invalid duplicated packagedcode.Package types: '
                    '"{}:{}" and "{}:{}" have the same type.'
-                  .format(pmt.default_type, pmt.__name__, seen.default_type, seen.__name__,))
+                  .format(manifest.package_manifest_type, manifest.__name__, seen.package_manifest_type, seen.__name__,))
             raise Exception(msg)
         else:
-            seen_types[pmt.default_type] = pmt
+            seen_types[manifest.package_manifest_type] = manifest
 
 
 def get_package_class(scan_data, default=models.Package):

src/packagedcode/about.py

@@ -29,7 +29,7 @@
 # TODO: Override get_package_resource so it returns the Resource that the ABOUT file is describing
 
 @attr.s()
-class AboutPackage(models.Package):
+class AboutPackage(models.Package, models.PackageManifest):
     file_patterns = ('*.ABOUT',)
     default_type = 'about'
 

src/packagedcode/alpine.py

@@ -27,7 +27,7 @@
 
 
 @attr.s()
-class AlpinePackage(models.Package):
+class AlpinePackage(models.Package, models.PackageManifest):
     extensions = ('.apk', 'APKBUILD')
     default_type = 'alpine'
 

src/packagedcode/bower.py

@@ -30,7 +30,7 @@
 
 
 @attr.s()
-class BowerPackage(models.Package):
+class BowerPackage(models.Package, models.PackageManifest):
     file_patterns = ('bower.json', '.bower.json')
     default_type = 'bower'
 

src/packagedcode/build.py

@@ -38,7 +38,7 @@
 
 
 @attr.s()
-class BaseBuildManifestPackage(models.Package):
+class BaseBuildManifestPackage(models.Package, models.PackageManifest):
     file_patterns = tuple()
 
     @classmethod

src/packagedcode/cargo.py

@@ -34,7 +34,7 @@
 
 
 @attr.s()
-class RustCargoCrate(models.Package):
+class RustCargoCrate(models.Package, models.PackageManifest):
     file_patterns = ('Cargo.toml', 'Cargo.lock')
     default_type = 'cargo'
     default_primary_language = 'Rust'

src/packagedcode/chef.py

@@ -38,7 +38,7 @@
 
 
 @attr.s()
-class ChefPackage(models.Package):
+class ChefPackage(models.Package, models.PackageManifest):
     file_patterns = ('metadata.json', 'metadata.rb')
     filetypes = ('.tgz',)
     mimetypes = ('application/x-tar',)

src/packagedcode/cocoapods.py

@@ -43,7 +43,7 @@
 
 
 @attr.s()
-class CocoapodsPackage(models.Package):
+class CocoapodsPackage(models.Package, models.PackageManifest):
     metafiles = (
         '*.podspec',
         '*podfile.lock',

src/packagedcode/conda.py

@@ -44,7 +44,7 @@ def logger_debug(*args):
 
 
 @attr.s()
-class CondaPackage(models.Package):
+class CondaPackage(models.Package, models.PackageManifest):
     file_patterns = ('meta.yaml', 'META.yml',)
     default_type = 'conda'
     default_web_baseurl = None

src/packagedcode/cran.py

@@ -34,7 +34,7 @@
 
 
 @attr.s()
-class CranPackage(models.Package):
+class CranPackage(models.Package, models.PackageManifest):
     file_patterns = ('DESCRIPTION',)
     default_type = 'cran'
     default_web_baseurl = 'https://cran.r-project.org/package='