Preparation for PR #2093

doc/man1/exekall.1

@@ -67,8 +67,8 @@ subcommands:
 .sp
 .nf
 .ft C
-usage: exekall run [\-h] [\-s ID_PATTERN] [\-\-list] [\-n N] [\-\-load\-db LOAD_DB]
-                   [\-\-load\-type TYPE_PATTERN]
+usage: exekall run [\-h] [\-\-dependency DEPENDENCY] [\-s ID_PATTERN] [\-\-list]
+                   [\-n N] [\-\-load\-db LOAD_DB] [\-\-load\-type TYPE_PATTERN]
                    [\-\-replay REPLAY | \-\-load\-uuid LOAD_UUID]
                    [\-\-artifact\-dir ARTIFACT_DIR | \-\-artifact\-root ARTIFACT_ROOT]
                    [\-\-no\-save\-value\-db] [\-\-verbose] [\-\-pdb]
@@ -98,6 +98,11 @@ positional arguments:
 
 optional arguments:
   \-h, \-\-help            show this help message and exit
+  \-\-dependency DEPENDENCY
+                        Same as specifying a module in PYTHON_MODULES but will only be used to
+                        build an expression if it would have been selected without that module
+                        listed. Operators defined in modules listed here will not be used as
+                        the root operator in any expression.
   \-s ID_PATTERN, \-\-select ID_PATTERN
                         Only run the expressions with an ID matching any of the supplied
                         pattern. A pattern starting with \(dq!\(dq can be used to exclude IDs

lisa/_assets/kmodules/lisa/introspect_header.py

@@ -134,4 +134,5 @@ def main():
 
 
 
-main()
+if __name__ == '__main__':
+    main()

lisa/conf.py

@@ -999,7 +999,7 @@ def eq_prefix_keys(key1, key2):
                 )
                 for cls_ in offending
             ):
-                raise RuntimeError(f'Class {cls.__qualname__} cannot reuse top level key "{format_keys(toplevel_keys)}" as it is already used by {", ".join(offending)}')
+                raise RuntimeError(f'Class {cls.__qualname__} cannot reuse top level key "{format_keys(toplevel_keys)}" as it is already used by {", ".join(map(str, offending))}')
             else:
                 cls._REGISTERED_TOPLEVEL_KEYS[toplevel_keys] = cls
 

lisa/utils.py

@@ -700,15 +700,18 @@ def _import_all_submodules(pkg_name, pkg_path, best_effort=False):
     for _, module_name, _ in (
         pkgutil.walk_packages(pkg_path, prefix=pkg_name + '.')
     ):
-        try:
-            module = importlib.import_module(module_name)
-        except ImportError:
-            if best_effort:
-                pass
+            try:
+                # Silence warnings if we hit some deprecated modules
+                with warnings.catch_warnings():
+                    warnings.simplefilter(action='ignore')
+                    module = importlib.import_module(module_name)
+            except ImportError:
+                if best_effort:
+                    pass
+                else:
+                    raise
             else:
-                raise
-        else:
-            modules.append(module)
+                modules.append(module)
 
     return modules