Merge branch 'master' into _cmd_property

Author: tleonhardt

.github/workflows/build.yml

@@ -2,29 +2,36 @@
 # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
 name: "build"
 
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4  # https://github.com/actions/checkout
+      - uses: actions/checkout@v4 # https://github.com/actions/checkout
         with:
           # Only a single commit is fetched by default, for the ref/SHA that triggered the workflow.
           # Set fetch-depth: 0 to fetch all history for all branches and tags.
           fetch-depth: 0 # Needed for setuptools_scm to work correctly
-      - uses: actions/setup-python@v5  # https://github.com/actions/setup-python
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - name: Install dependencies
-        run: python -m pip install --upgrade pip setuptools setuptools-scm nox
-      - name: Run tests and post coverage results
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: python -m nox --non-interactive --session tests-${{ matrix.python-version }}  # Run nox for a single version of Python
+
+      - name: Install the project
+        run: uv sync --all-extras --dev
+
+      - name: Run tests
+        run: uv run inv pytest --junit --no-pty --base
+
+      - name: Run isolated tests
+        run: uv run inv pytest --junit --no-pty --isolated

cmd2/cmd2.py

@@ -3404,8 +3404,7 @@ def _cmdloop(self) -> None:
     alias_description = "Manage aliases\n" "\n" "An alias is a command that enables replacement of a word by another string."
     alias_epilog = "See also:\n" "  macro"
     alias_parser = argparse_custom.DEFAULT_ARGUMENT_PARSER(description=alias_description, epilog=alias_epilog)
-    alias_subparsers = alias_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND')
-    alias_subparsers.required = True
+    alias_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND', required=True)
 
     # Preserve quotes since we are passing strings to other commands
     @with_argparser(alias_parser, preserve_quotes=True)
@@ -3573,8 +3572,7 @@ def _alias_list(self, args: argparse.Namespace) -> None:
     macro_description = "Manage macros\n" "\n" "A macro is similar to an alias, but it can contain argument placeholders."
     macro_epilog = "See also:\n" "  alias"
     macro_parser = argparse_custom.DEFAULT_ARGUMENT_PARSER(description=macro_description, epilog=macro_epilog)
-    macro_subparsers = macro_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND')
-    macro_subparsers.required = True
+    macro_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND', required=True)
 
     # Preserve quotes since we are passing strings to other commands
     @with_argparser(macro_parser, preserve_quotes=True)

noxfile.py

@@ -52,7 +52,6 @@ dev = [
     "doc8",
     "invoke",
     "mypy",
-    "nox",
     "pytest",
     "pytest-cov",
     "pytest-mock",

pyproject.toml

@@ -49,7 +49,7 @@ def rmrf(items, verbose=True):
 
 #####
 #
-# pytest, nox, pylint, and codecov
+# pytest, pylint, and codecov
 #
 #####
 
@@ -117,17 +117,6 @@ def mypy_clean(context):
 namespace_clean.add_task(mypy_clean, 'mypy')
 
 
-@invoke.task
-def nox_clean(context):
-    """Remove nox virtualenvs and logs"""
-    # pylint: disable=unused-argument
-    with context.cd(TASK_ROOT_STR):
-        rmrf('.nox')
-
-
-namespace_clean.add_task(nox_clean, 'nox')
-
-
 #####
 #
 # documentation

tasks.py

@@ -250,8 +250,7 @@ def test_preservelist(argparse_app):
 
 def _build_has_subcmd_parser() -> cmd2.Cmd2ArgumentParser:
     has_subcmds_parser = cmd2.Cmd2ArgumentParser(description="Tests as_subcmd_to decorator")
-    has_subcmds_subparsers = has_subcmds_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND')
-    has_subcmds_subparsers.required = True
+    has_subcmds_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND', required=True)
     return has_subcmds_parser
 
 
@@ -273,8 +272,7 @@ def base_helpless(self, args):
 
     # create the top-level parser for the base command
     base_parser = cmd2.Cmd2ArgumentParser()
-    base_subparsers = base_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND')
-    base_subparsers.required = True
+    base_subparsers = base_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND', required=True)
 
     # create the parser for the "foo" subcommand
     parser_foo = base_subparsers.add_parser('foo', help='foo help')

tests/test_argparse.py

@@ -1249,8 +1249,7 @@ def do_custom_completer(self, args: argparse.Namespace) -> None:
 
     # Test as_subcommand_to decorator with custom completer
     top_parser = Cmd2ArgumentParser(description="Top Command")
-    top_subparsers = top_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND')
-    top_subparsers.required = True
+    top_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND', required=True)
 
     @with_argparser(top_parser)
     def do_top(self, args: argparse.Namespace) -> None:

tests/test_argparse_completer.py

@@ -35,8 +35,7 @@ def base_helpless(self, args):
 
     # create the top-level parser for the base command
     base_parser = cmd2.Cmd2ArgumentParser()
-    base_subparsers = base_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND')
-    base_subparsers.required = True
+    base_subparsers = base_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND', required=True)
 
     # create the parser for the "foo" subcommand
     parser_foo = base_subparsers.add_parser('foo', help='foo help')

tests_isolated/test_commandset/test_argparse_subcommands.py

@@ -93,8 +93,7 @@ def do_elderberry(self, ns: argparse.Namespace):
     # Test that CommandSet with as_subcommand_to decorator successfully loads
     # during `cmd2.Cmd.__init__()`.
     main_parser = cmd2.Cmd2ArgumentParser(description="Main Command")
-    main_subparsers = main_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND')
-    main_subparsers.required = True
+    main_parser.add_subparsers(dest='subcommand', metavar='SUBCOMMAND', required=True)
 
     @cmd2.with_category('Alone')
     @cmd2.with_argparser(main_parser)