Merge branch 'main' into lf32-licensetext-devel

Conflicts:
	scanpipe/templates/scanpipe/base.html

Author: lf32

CHANGELOG.rst

@@ -27,8 +27,11 @@ v31.0.0 (next)
   Reference: https://tracker.debian.org/pkg/wait-for-it
   https://github.com/nexB/scancode.io/issues/387
 
+- Add support for multiple inputs in the LoadInventory pipeline.
+  https://github.com/nexB/scancode.io/issues/451
+
 - Add new SCANCODEIO_REDIS_PASSWORD environment variable and setting
-  to optionally set Redis instance password
+  to optionally set Redis instance password.
 
 - Ensure a project cannot be deleted through the API while a pipeline is running.
   https://github.com/nexB/scancode.io/issues/402

scancodeio/settings.py

@@ -223,6 +223,7 @@
         "scanpipe": {
             "handlers": ["null"] if IS_TESTS else ["console"],
             "level": env.str("SCANCODEIO_LOG_LEVEL", "INFO"),
+            "propagate": False,
         },
     },
 }

scancodeio/static/bulma-0.9.2.min.css

@@ -0,0 +1,15 @@
+about_resource: bulma-0.9.4.min.css
+name: bulma
+version: 0.9.4
+download_url: https://github.com/jgthms/bulma/releases/download/0.9.4/bulma-0.9.4.zip
+description: Modern CSS framework based on Flexbox
+homepage_url: https://bulma.io
+package_url: pkg:github/jgthms/bulma@0.9.4?download_url=https://github.com/jgthms/bulma/releases/download/0.9.4/bulma-0.9.4.zip
+license_expression: mit
+attribute: yes
+checksum_md5: 790c308ba7832ce5861cd4665902daaf
+checksum_sha1: e9c33fb7adb54a6d157c01e9070c79508b42f589
+licenses:
+  - key: mit
+    name: MIT License
+    file: mit.LICENSE

scancodeio/static/bulma-0.9.2.min.css.ABOUT

@@ -1,11 +1,9 @@
-about_resource: fontawesome-5.15.1.all.min.js
-download_url: https://use.fontawesome.com/releases/v5.15.1/fontawesome-free-5.15.1-web.zip
+about_resource: fontawesome-5.15.4.all.min.js
+download_url: https://use.fontawesome.com/releases/v5.15.4/fontawesome-free-5.15.4-web.zip
 license_expression: mit AND ofl-1.1 AND cc-by-4.0
 copyright: Copyright (c) Font Awesome
 attribute: yes
 track_changes: yes
-checksum_md5: 465d5d1885864b97e218bbcabbe96538
-checksum_sha1: 911a6540bc0cc00c5d78288b24ad646ec71c21c8
 licenses:
   - key: mit
     name: MIT License

scancodeio/static/bulma-0.9.4.min.css

@@ -26,30 +26,30 @@
 
 class LoadInventory(Pipeline):
     """
-    A pipeline to load an inventory of files and packages from a ScanCode JSON scan.
-    (Presumably containing file information and package scan data).
+    A pipeline to load one or more inventory of files and packages from a ScanCode JSON
+    scan results. (Presumably containing resource information and package scan data).
     """
 
     @classmethod
     def steps(cls):
         return (
-            cls.get_scan_json_input,
-            cls.build_inventory_from_scan,
+            cls.get_scan_json_inputs,
+            cls.build_inventory_from_scans,
         )
 
-    def get_scan_json_input(self):
+    def get_scan_json_inputs(self):
         """
-        Locates a JSON scan input from a project's input/ directory.
+        Locates all the ScanCode JSON scan results from the project's input/ directory.
+        This includes all files with a .json extension.
         """
-        inputs = list(self.project.inputs(pattern="*.json"))
+        self.input_locations = [
+            str(scan_input.absolute())
+            for scan_input in self.project.inputs(pattern="*.json")
+        ]
 
-        if len(inputs) != 1:
-            raise Exception("Only 1 JSON input file supported")
-
-        self.input_location = str(inputs[0].absolute())
-
-    def build_inventory_from_scan(self):
+    def build_inventory_from_scans(self):
         """
-        Processes a JSON Scan results file to populate codebase resources and packages.
+        Processes JSON scan results files to populate codebase resources and packages.
         """
-        scancode.create_inventory_from_scan(self.project, self.input_location)
+        for input_location in self.input_locations:
+            scancode.create_inventory_from_scan(self.project, input_location)