Fixes in opening packages

common.mk

@@ -70,7 +70,11 @@ run-with-updates: run
 run-with-external: CONTAINER_NETWORK=external
 run-with-external: run
 
+pull-base:
+	docker pull ${BASE_IMAGE}
+
 refresh: CACHE="--no-cache"
+refresh: pull-base
 refresh: build
 
 run-dep: CONTAINER_NETWORK=external

python-magic/VERSION

@@ -1 +1 @@
-5
+7

python-magic/service/extract/pycdc.py

@@ -1,6 +1,5 @@
 import os
 import re
-import shutil
 import subprocess
 
 from assemblyline_v4_service.common.result import ResultTextSection

python-magic/service/package/analyzer.py

@@ -58,19 +58,15 @@ def analyze(self):
 
             scripts = opener.get_console_scripts()
             if scripts:
-                script_section = ResultTextSection(
-                    "Console scripts", auto_collapse=True
-                )
+                script_section = ResultTextSection("Console scripts", auto_collapse=True)
                 script_section.add_line("This package declares following console scripts:")
                 for script in scripts:
                     script_section.add_line(script)
                 section.add_subsection(script_section)
 
             top_level_modules = opener.get_top_level_modules()
             if top_level_modules:
-                module_section = ResultTextSection(
-                    "Top-level modules", auto_collapse=True
-                )
+                module_section = ResultTextSection("Top-level modules", auto_collapse=True)
                 module_section.add_line("This package declares following top-level modules:")
                 for module in top_level_modules:
                     module_section.add_line(module)

python-magic/service/package/opener.py

@@ -2,6 +2,7 @@
 import configparser
 import tarfile
 import zipfile
+from contextlib import suppress
 from functools import lru_cache
 from itertools import chain
 
@@ -86,18 +87,23 @@ def get_package_name(self) -> str:
 
     def get_console_scripts(self):
         if entry_points := self.get_distribution_file("entry_points.txt"):
-            parser = CaseSensitiveConfigParser()
-            parser.read_string(entry_points)
-            return (k for k, _ in parser.items("console_scripts"))
+            with suppress(configparser.Error):
+                parser = CaseSensitiveConfigParser()
+                parser.read_string(entry_points)
+                return (k for k, _ in parser.items("console_scripts"))
         return []
 
     def get_requirements(self):
         required = set()
-        for req in chain(self.distribution.requires, self.distribution.requires_dist):
+        requires_txt = []
+        if requirements := self.get_distribution_file("requires.txt"):
+            requires_txt = requirements.splitlines()
+        for req in chain(self.distribution.requires, self.distribution.requires_dist, requires_txt):
             if any(op in req for op in ("<", ">", "=", " ")):
                 for op in ("<", ">", "!", "~", "=", " "):
                     req = req.split(op, 1)[0]
-            required.add(req.strip())
+            if req:
+                required.add(req.strip())
         return required
 
     def get_top_level_modules(self):

python-magic/service/updater.py

@@ -20,9 +20,7 @@ def __init__(self, *args, **kwargs):
     # def is_valid(self, file_path) -> bool:
     #     return True
 
-    def import_update(
-        self, files_sha256, source, default_classification
-    ) -> None:
+    def import_update(self, files_sha256, source, default_classification) -> None:
         output_dir = os.path.join(self.latest_updates_dir, source)
         os.makedirs(os.path.join(self.latest_updates_dir, source), exist_ok=True)
         for file, _ in files_sha256: