Upgrae to ruff 0.15.0 and prettier 3.8.1

Ruff changed 2 relevant things:
- Sometimes prefers to use or instead of if in assignment
- Improved Lambda function formatting

Author: tleonhardt

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.14.14"
+    rev: "v0.15.0"
     hooks:
       - id: ruff-format
         args: [--config=ruff.toml]
@@ -21,5 +21,5 @@ repos:
     hooks:
       - id: prettier
         additional_dependencies:
-          - prettier@3.8.0
+          - prettier@3.8.1
           - prettier-plugin-toml@2.0.6

cmd2/argparse_completer.py

@@ -539,7 +539,7 @@ def _format_completions(self, arg_state: _ArgumentState, completions: list[str]
         # Check if there are too many CompletionItems to display as a table
         if len(completions) <= self._cmd2_app.max_completion_items:
             # If a metavar was defined, use that instead of the dest field
-            destination = arg_state.action.metavar if arg_state.action.metavar else arg_state.action.dest
+            destination = arg_state.action.metavar or arg_state.action.dest
 
             # Handle case where metavar was a tuple
             if isinstance(destination, tuple):

cmd2/argparse_custom.py

@@ -1477,7 +1477,7 @@ def __init__(
             usage=usage,
             description=description,  # type: ignore[arg-type]
             epilog=epilog,  # type: ignore[arg-type]
-            parents=parents if parents else [],
+            parents=parents or [],
             formatter_class=formatter_class,
             prefix_chars=prefix_chars,
             fromfile_prefix_chars=fromfile_prefix_chars,

cmd2/cmd2.py

@@ -758,9 +758,11 @@ def register_command_set(self, cmdset: CommandSet) -> None:
             list[tuple[str, Callable[..., Any]]],
             inspect.getmembers(
                 cmdset,
-                predicate=lambda meth: isinstance(meth, Callable)  # type: ignore[arg-type]
-                and hasattr(meth, '__name__')
-                and meth.__name__.startswith(COMMAND_FUNC_PREFIX),
+                predicate=lambda meth: (  # type: ignore[arg-type]
+                    isinstance(meth, Callable)  # type: ignore[arg-type]
+                    and hasattr(meth, '__name__')
+                    and meth.__name__.startswith(COMMAND_FUNC_PREFIX)
+                ),
             ),
         )
 
@@ -913,9 +915,11 @@ def unregister_command_set(self, cmdset: CommandSet) -> None:
 
             methods: list[tuple[str, Callable[..., Any]]] = inspect.getmembers(
                 cmdset,
-                predicate=lambda meth: isinstance(meth, Callable)  # type: ignore[arg-type]
-                and hasattr(meth, '__name__')
-                and meth.__name__.startswith(COMMAND_FUNC_PREFIX),
+                predicate=lambda meth: (  # type: ignore[arg-type]
+                    isinstance(meth, Callable)  # type: ignore[arg-type]
+                    and hasattr(meth, '__name__')
+                    and meth.__name__.startswith(COMMAND_FUNC_PREFIX)
+                ),
             )
 
             for cmd_func_name, command_method in methods:
@@ -959,9 +963,11 @@ def check_parser_uninstallable(parser: argparse.ArgumentParser) -> None:
 
         methods: list[tuple[str, Callable[..., Any]]] = inspect.getmembers(
             cmdset,
-            predicate=lambda meth: isinstance(meth, Callable)  # type: ignore[arg-type]
-            and hasattr(meth, '__name__')
-            and meth.__name__.startswith(COMMAND_FUNC_PREFIX),
+            predicate=lambda meth: (  # type: ignore[arg-type]
+                isinstance(meth, Callable)  # type: ignore[arg-type]
+                and hasattr(meth, '__name__')
+                and meth.__name__.startswith(COMMAND_FUNC_PREFIX)
+            ),
         )
 
         for cmd_func_name, command_method in methods:
@@ -983,10 +989,12 @@ def _register_subcommands(self, cmdset: Union[CommandSet, 'Cmd']) -> None:
         # find methods that have the required attributes necessary to be recognized as a sub-command
         methods = inspect.getmembers(
             cmdset,
-            predicate=lambda meth: isinstance(meth, Callable)  # type: ignore[arg-type]
-            and hasattr(meth, constants.SUBCMD_ATTR_NAME)
-            and hasattr(meth, constants.SUBCMD_ATTR_COMMAND)
-            and hasattr(meth, constants.CMD_ATTR_ARGPARSER),
+            predicate=lambda meth: (
+                isinstance(meth, Callable)  # type: ignore[arg-type]
+                and hasattr(meth, constants.SUBCMD_ATTR_NAME)
+                and hasattr(meth, constants.SUBCMD_ATTR_COMMAND)
+                and hasattr(meth, constants.CMD_ATTR_ARGPARSER)
+            ),
         )
 
         # iterate through all matching methods
@@ -1072,10 +1080,12 @@ def _unregister_subcommands(self, cmdset: Union[CommandSet, 'Cmd']) -> None:
         # find methods that have the required attributes necessary to be recognized as a sub-command
         methods = inspect.getmembers(
             cmdset,
-            predicate=lambda meth: isinstance(meth, Callable)  # type: ignore[arg-type]
-            and hasattr(meth, constants.SUBCMD_ATTR_NAME)
-            and hasattr(meth, constants.SUBCMD_ATTR_COMMAND)
-            and hasattr(meth, constants.CMD_ATTR_ARGPARSER),
+            predicate=lambda meth: (
+                isinstance(meth, Callable)  # type: ignore[arg-type]
+                and hasattr(meth, constants.SUBCMD_ATTR_NAME)
+                and hasattr(meth, constants.SUBCMD_ATTR_COMMAND)
+                and hasattr(meth, constants.CMD_ATTR_ARGPARSER)
+            ),
         )
 
         # iterate through all matching methods
@@ -2262,7 +2272,7 @@ def _display_matches_pyreadline(self, matches: list[str]) -> None:  # pragma: no
             # Otherwise use pyreadline3's formatter
             else:
                 # Check if we should show display_matches
-                matches_to_display = self.display_matches if self.display_matches else matches
+                matches_to_display = self.display_matches or matches
 
                 # Add padding for visual appeal
                 matches_to_display, _ = self._pad_matches_to_display(matches_to_display)

cmd2/command_definition.py

@@ -63,9 +63,11 @@ def decorate_class(cls: CommandSetType) -> CommandSetType:
         # 3. Must be a member of the class being decorated and not one inherited from a parent declaration
         methods = inspect.getmembers(
             cls,
-            predicate=lambda meth: inspect.isfunction(meth)
-            and meth.__name__.startswith(COMMAND_FUNC_PREFIX)
-            and meth in inspect.getmro(cls)[0].__dict__.values(),
+            predicate=lambda meth: (
+                inspect.isfunction(meth)
+                and meth.__name__.startswith(COMMAND_FUNC_PREFIX)
+                and meth in inspect.getmro(cls)[0].__dict__.values()
+            ),
         )
         category_decorator = with_category(category)
         for method in methods:

package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "prettier": "^3.8.0",
+    "prettier": "^3.8.1",
     "prettier-plugin-toml": "^2.0.6"
   }
 }