Merge latest develop

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

Author: pombredanne

AUTHORS.rst

@@ -40,6 +40,7 @@ The following organizations or individuals have contributed to ScanCode:
 - Johannes Najjar @joshovi
 - Jose Nazario @paralax
 - Kevin Ji @KevinJi22
+- Lali Akhil Raj @lf32
 - Lemo Shi @lemoshi
 - Li Ha @linexb
 - Mankaran Singh @MankaranSingh

CHANGELOG.rst

@@ -324,6 +324,15 @@ Development environment and Code API changes:
   environment variable. There is no need to replace the regen=False with
   regen=True in the code.
 
+Miscellaneous
+--------------
+
+- Added support for usage of shortcut flags
+  - `-A` or `--about`
+  - `-q` or `--quiet` 
+  - `-v` or `--verbose` 
+  - `-V` or `--version` can be used.
+
 
 30.1.0 - 2021-09-25
 --------------------

docs/source/rst_snippets/core_options.rst

@@ -4,9 +4,9 @@ All "Core" Scan Options
 -n, --processes INTEGER  Scan ``<input>`` using n parallel processes.
                          [Default: 1]
 
---verbose                Print verbose file-by-file progress messages.
+-v, --verbose            Print verbose file-by-file progress messages.
 
---quiet                  Do not print summary or progress messages.
+-q, --quiet              Do not print summary or progress messages.
 
 --timeout FLOAT          Stop scanning a file if scanning takes longer
                          than a timeout in seconds.  [Default: 120]

requirements.txt

@@ -13,7 +13,7 @@ commoncode==31.0.0b4
 construct==2.10.68
 container-inspector==31.0.0
 cryptography==36.0.2
-debian-inspector==30.0.0
+debian-inspector==31.0.0b1
 dockerfile-parse==1.2.0
 dparse2==0.6.1
 extractcode==31.0.0

setup-mini.cfg

@@ -71,7 +71,7 @@ install_requires =
     colorama >= 0.3.9
     commoncode==31.0.0b4
     container-inspector >= 31.0.0
-    debian-inspector >= 30.0.0
+    debian-inspector >= 31.0.0b1
     dparse2 >= 0.6.1
     fasteners
     fingerprints >= 0.6.0
@@ -112,6 +112,8 @@ install_requires =
     xmltodict >= 0.11.0
     zipp >= 3.0.0; python_version < "3.9"
     typecode >= 30.0.0
+#    typecode[full] >= 30.0.0
+#    extractcode[full] >= 31.0.0
 
 
 [options.packages.find]
@@ -128,6 +130,8 @@ testing =
     pytest-xdist >= 2
     aboutcode-toolkit >= 7.0.2
     twine
+    black
+    isort
 
 docs =
     Sphinx >= 3.3.1

setup.cfg

@@ -71,7 +71,7 @@ install_requires =
     colorama >= 0.3.9
     commoncode==31.0.0b4
     container-inspector >= 31.0.0
-    debian-inspector >= 30.0.0
+    debian-inspector >= 31.0.0b1
     dparse2 >= 0.6.1
     fasteners
     fingerprints >= 0.6.0

src/packagedcode/alpine.py

@@ -1772,4 +1772,3 @@ def detect_licenses(locin, locout):
     # get_apkindex_licenses(loc, 'alpine-licenses.csv')
     get_apkbuild_licenses(loc, 'alpine-licenses.csv')
     detect_licenses('alpine-licenses.csv', 'alpine-licenses-detection.csv')
-

src/packagedcode/models.py

@@ -25,6 +25,7 @@
 from commoncode.datautils import Mapping
 from commoncode.datautils import String
 from commoncode.fileutils import as_posixpath
+from commoncode.resource import Resource
 from typecode import contenttype
 
 """
@@ -1201,7 +1202,7 @@ def __attrs_post_init__(self, *args, **kwargs):
             self.package_uid = build_package_uid(self.purl)
 
     def to_dict(self):
-        return  super().to_dict(with_details=False)
+        return super().to_dict(with_details=False)
 
     @classmethod
     def from_package_data(cls, package_data, datafile_path):
@@ -1340,6 +1341,24 @@ def get_packages_files(self, codebase):
                 yield resource
 
 
+@attr.attributes(slots=True)
+class PackageWithResources(Package):
+    """
+    A Package with Resources.
+    """
+
+    resources = List(
+        item_type=Resource,
+        label='List of Resources',
+        help='List of Resources for this package.',
+    )
+
+    def to_dict(self):
+        package_data = super().to_dict()
+        package_data['resources'] = [resource.to_dict() for resource in self.resources]
+        return package_data
+
+
 def get_files_for_packages(codebase):
     """
     Yield tuple of (Resource, package_uid) for all resources in codebase that are

src/packagedcode/plugin_package.py

@@ -25,6 +25,7 @@
 from packagedcode.models import Dependency
 from packagedcode.models import Package
 from packagedcode.models import PackageData
+from packagedcode.models import PackageWithResources
 
 TRACE = os.environ.get('SCANCODE_DEBUG_PACKAGE_API', False)
 
@@ -153,6 +154,36 @@ def process_codebase(self, codebase, strip_root=False, **kwargs):
         create_package_and_deps(codebase, strip_root=strip_root, **kwargs)
 
 
+def get_installed_packages(root_dir, processes=2, **kwargs):
+    """
+    Yield Package and their Resources as they are found in `root_dir`
+    """
+    from scancode import cli
+
+    _, codebase = cli.run_scan(
+        input=root_dir,
+        processes=processes,
+        quiet=True,
+        verbose=False,
+        max_in_memory=0,
+        return_results=False,
+        return_codebase=True,
+        system_package=True,
+    )
+
+    packages_by_uid = {}
+    for package in codebase.attributes.packages:
+        p = PackageWithResources.from_dict(package)
+        packages_by_uid[p.package_uid] = p
+
+    for resource in codebase.walk():
+        for package_uid in resource.for_packages:
+            p = packages_by_uid[package_uid]
+            p.resources.append(resource)
+
+    yield from packages_by_uid.values()
+
+
 def create_package_and_deps(codebase, strip_root=False, **kwargs):
     """
     Create and save top-level Package and Dependency from the parsed

src/packagedcode/pypi.py

@@ -1196,7 +1196,7 @@ def get_requires_dependencies(requires, default_scope='install'):
                 is_runtime=True,
                 is_optional=False,
                 is_resolved=is_resolved,
-                extracted_requirement=requirement,
+                extracted_requirement=str(req),
         ))
 
     return dependent_packages