Re-enable sourcery

With the free open source plan, sourcery works only when called from the
repository's root directory. Re-enable it by calling it from there.

Also apply sourcery's suggestions to file generate_firmware_package.py,
which did not exist before disabling sourcery.

.gitlab-ci.yml

@@ -70,16 +70,10 @@ script_limit:
         --key before_script
         --key after_script
 
-# FIXME: Find out how to correctly use sourcery with its new open source plan. According
-# to the documentation, the login step should be obsolete. Sourcery complains, however,
-# that our code is closed-source, which is not true.
-# See https://docs.sourcery.ai/Guides/Getting-Started/Command-Line/
-# sourcery:
-#   extends: .analyze
-#   script:
-#     - cd scripts
-#     - sourcery login --token $SOURCERY_TOKEN
-#     - sourcery review --check --verbose *.py
+sourcery:
+  extends: .analyze
+  script:
+    - sourcery review --check --verbose scripts/*.py
 
 yamllint:
   extends: .analyze

scripts/generate_firmware_package.py

@@ -25,10 +25,7 @@ def generate_entry(
 ):
     """Create a JSON object for a new firmware package entry"""
 
-    package_entry = {}
-
-    package_entry["name"] = name
-    package_entry["type"] = _type
+    package_entry = {"name": name, "type": _type}
 
     if description:
         package_entry["description"] = description
@@ -112,6 +109,8 @@ def generate_firmware_package(
     sbom = []
     sbom_packages = []
 
+    sbom_files = []
+
     if "fngsystem".casefold() in release_name.casefold():
         # Flash-N-Go System
         file_types = [
@@ -121,8 +120,6 @@ def generate_firmware_package(
             FirmwarePackageKeys.FNGSYS_CHECKSUM,
         ]
 
-        sbom_files = []
-
         for file_type in file_types:
             sbom_files.append(
                 generate_subpackage(
@@ -174,8 +171,6 @@ def generate_firmware_package(
             FirmwarePackageKeys.YOCTO_FS,
         ]
 
-        sbom_files = []
-
         for file_type in file_types:
             sbom_files.append(
                 generate_subpackage(
@@ -254,11 +249,7 @@ def main():
         sys.exit("ERROR: --output-file must at least contain a valid filename")
 
     # Parse/read file list
-    files = []
-
-    if args.files:
-        files = args.files.split()
-
+    files = args.files.split() if args.files else []
     if args.files_list:
         for files_file in glob.glob(args.files_list, recursive=True):
             print(f"Reading files from {files_file}")