cmd2 2.5.2__tar.gz → 2.5.4__tar.gz

{cmd2-2.5.2 → cmd2-2.5.4}/CHANGELOG.md

@@ -1,8 +1,18 @@
-# 2.5.2 (November 3, 2024)
+## 2.5.4 (November 6, 2024)
+* Bug Fixes
+  * Fixed `ZeroDivisionError` in `async_alert()` when `shutil.get_terminal_size().columns` is 0.
+
+## 2.5.3 (November 5, 2024)
+* Enhancements
+  * Changed `CommandSet._cmd` to a read-only property which never returns `None` because it
+    is meant to be called after the `CommandSet` is registered. This addresses type checker
+    errors that occurred if `CommandSet._cmd` wasn't cast or checked if `None` before use.
+
+## 2.5.2 (November 3, 2024)
 * Bug Fixes
   * Fixed default `pytest` execution when not using cmd2's custom `invoke` command via `inv pytest`
 
-# 2.5.1 (November 2, 2024)
+## 2.5.1 (November 2, 2024)
 * Bug Fixes
   * Fixed readline bug when using `ipy` command with `gnureadline` and Python 3.13
 

{cmd2-2.5.2 → cmd2-2.5.4}/PKG-INFO

@@ -1,62 +1,81 @@
 Metadata-Version: 2.1
 Name: cmd2
-Version: 2.5.2
+Version: 2.5.4
 Summary: cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python
-Home-page: https://github.com/python-cmd2/cmd2
-Author: Catherine Devlin
-Author-email: catherine.devlin@gmail.com
-License: MIT
-Keywords: command prompt console cmd
-Platform: any
+Author: cmd2 Contributors
+License: The MIT License (MIT)
+        
+        Copyright (c) 2008-2024 Catherine Devlin and others
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in
+        all copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+        THE SOFTWARE.
+        
+Keywords: CLI,cmd,command,interactive,prompt,Python
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: gnureadline; platform_system == "Darwin"
 Requires-Dist: pyperclip
+Requires-Dist: pyreadline3; platform_system == "Windows"
 Requires-Dist: wcwidth
-Requires-Dist: pyreadline3; sys_platform == "win32"
-Provides-Extra: test
-Requires-Dist: gnureadline; sys_platform == "darwin" and extra == "test"
-Requires-Dist: codecov; extra == "test"
-Requires-Dist: coverage; extra == "test"
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: pytest-mock; extra == "test"
+Provides-Extra: build
+Requires-Dist: build; extra == "build"
+Requires-Dist: setuptools; extra == "build"
+Requires-Dist: setuptools-scm; extra == "build"
 Provides-Extra: dev
 Requires-Dist: codecov; extra == "dev"
 Requires-Dist: doc8; extra == "dev"
 Requires-Dist: invoke; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
-Requires-Dist: nox; extra == "dev"
-Requires-Dist: pytest>=4.6; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Requires-Dist: sphinx-autobuild; extra == "dev"
+Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: setuptools; extra == "docs"
 Requires-Dist: setuptools_scm; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: sphinx-rtd-theme; extra == "docs"
 Requires-Dist: sphinx-autobuild; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Provides-Extra: test
+Requires-Dist: codecov; extra == "test"
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
 Provides-Extra: validate
 Requires-Dist: mypy; extra == "validate"
 Requires-Dist: ruff; extra == "validate"

{cmd2-2.5.2 → cmd2-2.5.4}/cmd2/cmd2.py

@@ -3404,8 +3404,7 @@ class Cmd(cmd.Cmd):
     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 @@ class Cmd(cmd.Cmd):
     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)
@@ -5337,9 +5335,12 @@ class Cmd(cmd.Cmd):
             if update_terminal:
                 import shutil
 
+                # Prior to Python 3.11 this can return 0, so use a fallback if needed.
+                terminal_columns = shutil.get_terminal_size().columns or constants.DEFAULT_TERMINAL_WIDTH
+
                 # Print a string which replaces the onscreen prompt and input lines with the alert.
                 terminal_str = ansi.async_alert_str(
-                    terminal_columns=shutil.get_terminal_size().columns,
+                    terminal_columns=terminal_columns,
                     prompt=rl_get_display_prompt(),
                     line=readline.get_line_buffer(),
                     cursor_offset=rl_get_point(),

{cmd2-2.5.2 → cmd2-2.5.4}/cmd2/command_definition.py

@@ -92,10 +92,31 @@ class CommandSet(object):
     """
 
     def __init__(self) -> None:
-        self._cmd: Optional[cmd2.Cmd] = None
+        # Private reference to the CLI instance in which this CommandSet running.
+        # This will be set when the CommandSet is registered and it should be
+        # accessed by child classes using the self._cmd property.
+        self.__cmd_internal: Optional[cmd2.Cmd] = None
+
         self._settables: Dict[str, Settable] = {}
         self._settable_prefix = self.__class__.__name__
 
+    @property
+    def _cmd(self) -> 'cmd2.Cmd':
+        """
+        Property for child classes to access self.__cmd_internal.
+
+        Using this property ensures that self.__cmd_internal has been set
+        and it tells type checkers that it's no longer a None type.
+
+        Override this property if you need to change its return type to a
+        child class of Cmd.
+
+        :raises: CommandSetRegistrationError if CommandSet is not registered.
+        """
+        if self.__cmd_internal is None:
+            raise CommandSetRegistrationError('This CommandSet is not registered')
+        return self.__cmd_internal
+
     def on_register(self, cmd: 'cmd2.Cmd') -> None:
         """
         Called by cmd2.Cmd as the first step to registering a CommandSet. The commands defined in this class have
@@ -103,9 +124,10 @@ class CommandSet(object):
         requiring access to the Cmd object (e.g. configure commands and their parsers based on CLI state data).
 
         :param cmd: The cmd2 main application
+        :raises: CommandSetRegistrationError if CommandSet is already registered.
         """
-        if self._cmd is None:
-            self._cmd = cmd
+        if self.__cmd_internal is None:
+            self.__cmd_internal = cmd
         else:
             raise CommandSetRegistrationError('This CommandSet has already been registered')
 
@@ -129,7 +151,7 @@ class CommandSet(object):
         Called by ``cmd2.Cmd`` after a CommandSet has been unregistered and all its commands removed from the CLI.
         Subclasses can override this to perform remaining cleanup steps.
         """
-        self._cmd = None
+        self.__cmd_internal = None
 
     @property
     def settable_prefix(self) -> str:
@@ -145,7 +167,7 @@ class CommandSet(object):
 
         :param settable: Settable object being added
         """
-        if self._cmd:
+        if self.__cmd_internal is not None:
             if not self._cmd.always_prefix_settables:
                 if settable.name in self._cmd.settables.keys() and settable.name not in self._settables.keys():
                     raise KeyError(f'Duplicate settable: {settable.name}')

{cmd2-2.5.2 → cmd2-2.5.4}/cmd2/constants.py

@@ -57,3 +57,6 @@ PARSER_ATTR_COMMANDSET = 'command_set'
 
 # custom attributes added to argparse Namespaces
 NS_ATTR_SUBCMD_HANDLER = '__subcmd_handler__'
+
+# For cases prior to Python 3.11 when shutil.get_terminal_size().columns can return 0.
+DEFAULT_TERMINAL_WIDTH = 80

{cmd2-2.5.2 → cmd2-2.5.4}/cmd2/utils.py

@@ -874,7 +874,8 @@ def align_text(
     )
 
     if width is None:
-        width = shutil.get_terminal_size().columns
+        # Prior to Python 3.11 this can return 0, so use a fallback if needed.
+        width = shutil.get_terminal_size().columns or constants.DEFAULT_TERMINAL_WIDTH
 
     if width < 1:
         raise ValueError("width must be at least 1")

{cmd2-2.5.2 → cmd2-2.5.4}/cmd2.egg-info/PKG-INFO

@@ -1,62 +1,81 @@
 Metadata-Version: 2.1
 Name: cmd2
-Version: 2.5.2
+Version: 2.5.4
 Summary: cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python
-Home-page: https://github.com/python-cmd2/cmd2
-Author: Catherine Devlin
-Author-email: catherine.devlin@gmail.com
-License: MIT
-Keywords: command prompt console cmd
-Platform: any
+Author: cmd2 Contributors
+License: The MIT License (MIT)
+        
+        Copyright (c) 2008-2024 Catherine Devlin and others
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in
+        all copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+        THE SOFTWARE.
+        
+Keywords: CLI,cmd,command,interactive,prompt,Python
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: gnureadline; platform_system == "Darwin"
 Requires-Dist: pyperclip
+Requires-Dist: pyreadline3; platform_system == "Windows"
 Requires-Dist: wcwidth
-Requires-Dist: pyreadline3; sys_platform == "win32"
-Provides-Extra: test
-Requires-Dist: gnureadline; sys_platform == "darwin" and extra == "test"
-Requires-Dist: codecov; extra == "test"
-Requires-Dist: coverage; extra == "test"
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: pytest-mock; extra == "test"
+Provides-Extra: build
+Requires-Dist: build; extra == "build"
+Requires-Dist: setuptools; extra == "build"
+Requires-Dist: setuptools-scm; extra == "build"
 Provides-Extra: dev
 Requires-Dist: codecov; extra == "dev"
 Requires-Dist: doc8; extra == "dev"
 Requires-Dist: invoke; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
-Requires-Dist: nox; extra == "dev"
-Requires-Dist: pytest>=4.6; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Requires-Dist: sphinx-autobuild; extra == "dev"
+Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: setuptools; extra == "docs"
 Requires-Dist: setuptools_scm; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: sphinx-rtd-theme; extra == "docs"
 Requires-Dist: sphinx-autobuild; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Provides-Extra: test
+Requires-Dist: codecov; extra == "test"
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
 Provides-Extra: validate
 Requires-Dist: mypy; extra == "validate"
 Requires-Dist: ruff; extra == "validate"

{cmd2-2.5.2 → cmd2-2.5.4}/cmd2.egg-info/SOURCES.txt

@@ -5,9 +5,7 @@ MANIFEST.in
 Pipfile
 README.md
 cmd2.png
-noxfile.py
 pyproject.toml
-setup.py
 tasks.py
 cmd2/__init__.py
 cmd2/ansi.py
@@ -108,7 +106,6 @@ examples/argparse_completion.py
 examples/async_printing.py
 examples/basic.py
 examples/basic_completion.py
-examples/cmd2_history.dat
 examples/cmd_as_argument.py
 examples/colors.py
 examples/custom_parser.py
@@ -140,108 +137,6 @@ examples/remove_settable.py
 examples/subcommands.py
 examples/table_creation.py
 examples/unicode_commands.py
-examples/.mypy_cache/CACHEDIR.TAG
-examples/.mypy_cache/3.12/@plugins_snapshot.json
-examples/.mypy_cache/3.12/_ast.data.json
-examples/.mypy_cache/3.12/_ast.meta.json
-examples/.mypy_cache/3.12/_codecs.data.json
-examples/.mypy_cache/3.12/_codecs.meta.json
-examples/.mypy_cache/3.12/_collections_abc.data.json
-examples/.mypy_cache/3.12/_collections_abc.meta.json
-examples/.mypy_cache/3.12/abc.data.json
-examples/.mypy_cache/3.12/abc.meta.json
-examples/.mypy_cache/3.12/argparse.data.json
-examples/.mypy_cache/3.12/argparse.meta.json
-examples/.mypy_cache/3.12/builtins.data.json
-examples/.mypy_cache/3.12/builtins.meta.json
-examples/.mypy_cache/3.12/codecs.data.json
-examples/.mypy_cache/3.12/codecs.meta.json
-examples/.mypy_cache/3.12/contextlib.data.json
-examples/.mypy_cache/3.12/contextlib.meta.json
-examples/.mypy_cache/3.12/dataclasses.data.json
-examples/.mypy_cache/3.12/dataclasses.meta.json
-examples/.mypy_cache/3.12/enum.data.json
-examples/.mypy_cache/3.12/enum.meta.json
-examples/.mypy_cache/3.12/genericpath.data.json
-examples/.mypy_cache/3.12/genericpath.meta.json
-examples/.mypy_cache/3.12/io.data.json
-examples/.mypy_cache/3.12/io.meta.json
-examples/.mypy_cache/3.12/pathlib.data.json
-examples/.mypy_cache/3.12/pathlib.meta.json
-examples/.mypy_cache/3.12/posixpath.data.json
-examples/.mypy_cache/3.12/posixpath.meta.json
-examples/.mypy_cache/3.12/re.data.json
-examples/.mypy_cache/3.12/re.meta.json
-examples/.mypy_cache/3.12/resource.data.json
-examples/.mypy_cache/3.12/resource.meta.json
-examples/.mypy_cache/3.12/sre_compile.data.json
-examples/.mypy_cache/3.12/sre_compile.meta.json
-examples/.mypy_cache/3.12/sre_constants.data.json
-examples/.mypy_cache/3.12/sre_constants.meta.json
-examples/.mypy_cache/3.12/sre_parse.data.json
-examples/.mypy_cache/3.12/sre_parse.meta.json
-examples/.mypy_cache/3.12/subprocess.data.json
-examples/.mypy_cache/3.12/subprocess.meta.json
-examples/.mypy_cache/3.12/types.data.json
-examples/.mypy_cache/3.12/types.meta.json
-examples/.mypy_cache/3.12/typing.data.json
-examples/.mypy_cache/3.12/typing.meta.json
-examples/.mypy_cache/3.12/typing_extensions.data.json
-examples/.mypy_cache/3.12/typing_extensions.meta.json
-examples/.mypy_cache/3.12/_typeshed/__init__.data.json
-examples/.mypy_cache/3.12/_typeshed/__init__.meta.json
-examples/.mypy_cache/3.12/_typeshed/importlib.data.json
-examples/.mypy_cache/3.12/_typeshed/importlib.meta.json
-examples/.mypy_cache/3.12/collections/__init__.data.json
-examples/.mypy_cache/3.12/collections/__init__.meta.json
-examples/.mypy_cache/3.12/collections/abc.data.json
-examples/.mypy_cache/3.12/collections/abc.meta.json
-examples/.mypy_cache/3.12/email/__init__.data.json
-examples/.mypy_cache/3.12/email/__init__.meta.json
-examples/.mypy_cache/3.12/email/_policybase.data.json
-examples/.mypy_cache/3.12/email/_policybase.meta.json
-examples/.mypy_cache/3.12/email/charset.data.json
-examples/.mypy_cache/3.12/email/charset.meta.json
-examples/.mypy_cache/3.12/email/contentmanager.data.json
-examples/.mypy_cache/3.12/email/contentmanager.meta.json
-examples/.mypy_cache/3.12/email/errors.data.json
-examples/.mypy_cache/3.12/email/errors.meta.json
-examples/.mypy_cache/3.12/email/header.data.json
-examples/.mypy_cache/3.12/email/header.meta.json
-examples/.mypy_cache/3.12/email/message.data.json
-examples/.mypy_cache/3.12/email/message.meta.json
-examples/.mypy_cache/3.12/email/policy.data.json
-examples/.mypy_cache/3.12/email/policy.meta.json
-examples/.mypy_cache/3.12/importlib/__init__.data.json
-examples/.mypy_cache/3.12/importlib/__init__.meta.json
-examples/.mypy_cache/3.12/importlib/_abc.data.json
-examples/.mypy_cache/3.12/importlib/_abc.meta.json
-examples/.mypy_cache/3.12/importlib/abc.data.json
-examples/.mypy_cache/3.12/importlib/abc.meta.json
-examples/.mypy_cache/3.12/importlib/machinery.data.json
-examples/.mypy_cache/3.12/importlib/machinery.meta.json
-examples/.mypy_cache/3.12/importlib/readers.data.json
-examples/.mypy_cache/3.12/importlib/readers.meta.json
-examples/.mypy_cache/3.12/importlib/metadata/__init__.data.json
-examples/.mypy_cache/3.12/importlib/metadata/__init__.meta.json
-examples/.mypy_cache/3.12/importlib/metadata/_meta.data.json
-examples/.mypy_cache/3.12/importlib/metadata/_meta.meta.json
-examples/.mypy_cache/3.12/importlib/resources/__init__.data.json
-examples/.mypy_cache/3.12/importlib/resources/__init__.meta.json
-examples/.mypy_cache/3.12/importlib/resources/abc.data.json
-examples/.mypy_cache/3.12/importlib/resources/abc.meta.json
-examples/.mypy_cache/3.12/os/__init__.data.json
-examples/.mypy_cache/3.12/os/__init__.meta.json
-examples/.mypy_cache/3.12/os/path.data.json
-examples/.mypy_cache/3.12/os/path.meta.json
-examples/.mypy_cache/3.12/sys/__init__.data.json
-examples/.mypy_cache/3.12/sys/__init__.meta.json
-examples/.mypy_cache/3.12/sys/_monitoring.data.json
-examples/.mypy_cache/3.12/sys/_monitoring.meta.json
-examples/.mypy_cache/3.12/zipfile/__init__.data.json
-examples/.mypy_cache/3.12/zipfile/__init__.meta.json
-examples/.mypy_cache/3.12/zipfile/_path.data.json
-examples/.mypy_cache/3.12/zipfile/_path.meta.json
 examples/modular_commands/__init__.py
 examples/modular_commands/commandset_basic.py
 examples/modular_commands/commandset_complex.py

{cmd2-2.5.2 → cmd2-2.5.4}/cmd2.egg-info/requires.txt

@@ -1,21 +1,28 @@
 pyperclip
 wcwidth
 
-[:sys_platform=='win32']
+[:platform_system == "Darwin"]
+gnureadline
+
+[:platform_system == "Windows"]
 pyreadline3
 
+[build]
+build
+setuptools
+setuptools-scm
+
 [dev]
 codecov
 doc8
 invoke
 mypy
-nox
-pytest>=4.6
+pytest
 pytest-cov
 pytest-mock
 sphinx
-sphinx-rtd-theme
 sphinx-autobuild
+sphinx-rtd-theme
 ruff
 twine
 
@@ -23,8 +30,8 @@ twine
 setuptools
 setuptools_scm
 sphinx
-sphinx-rtd-theme
 sphinx-autobuild
+sphinx-rtd-theme
 
 [test]
 codecov
@@ -33,9 +40,6 @@ pytest
 pytest-cov
 pytest-mock
 
-[test:sys_platform == "darwin"]
-gnureadline
-
 [validate]
 mypy
 ruff

{cmd2-2.5.2 → cmd2-2.5.4}/docs/conf.py

@@ -23,10 +23,13 @@ from importlib.metadata import version as get_version
 from os.path import abspath, dirname
 
 # Make sure we get the version of this copy of cmd2
-sys.path.insert(1, dirname(dirname(abspath(__file__))))
+root_path = dirname(dirname(abspath(__file__)))
+cmd2_ext_test_path = f'{root_path}/plugins/ext_test/'
+sys.path.insert(1, root_path)  # cmd2
+sys.path.insert(2, cmd2_ext_test_path)  # cmd2_ext_test
 
 # Import for custom theme from Read the Docs
-import sphinx_rtd_theme
+import sphinx_rtd_theme  # noqa E402
 
 # -- General configuration -----------------------------------------------------
 
@@ -179,9 +182,13 @@ autodoc_default_options = {'member-order': 'bysource'}
 # Ignore nitpicky warnings from autodoc which are occurring for very new versions of Sphinx and autodoc
 # They seem to be happening because autodoc is now trying to add hyperlinks to docs for typehint classes
 nitpick_ignore = [
-    ('py:class', 'cmd2.decorators.CommandParent'),
-    ('py:obj', 'cmd2.decorators.CommandParent'),
+    ('py:class', 'ArgparseCommandFunc'),
     ('py:class', 'argparse._SubParsersAction'),
+    ('py:class', 'cmd2.decorators.CommandParent'),
     ('py:class', 'cmd2.utils._T'),
+    ('py:class', 'CommandParent'),
+    ('py:class', 'frame'),
+    ('py:class', 'RawCommandFuncOptionalBoolReturn'),
     ('py:class', 'types.FrameType'),
+    ('py:obj', 'cmd2.decorators.CommandParent'),
 ]

{cmd2-2.5.2 → cmd2-2.5.4}/plugins/ext_test/tasks.py

@@ -157,7 +157,7 @@ namespace_clean.add_task(clean_all, 'all')
 def sdist(context):
     """Create a source distribution"""
     with context.cd(TASK_ROOT_STR):
-        context.run('python setup.py sdist')
+        context.run('python -m build --sdist')
 
 
 namespace.add_task(sdist)
@@ -167,7 +167,7 @@ namespace.add_task(sdist)
 def wheel(context):
     """Build a wheel distribution"""
     with context.cd(TASK_ROOT_STR):
-        context.run('python setup.py bdist_wheel')
+        context.run('python -m build --wheel')
 
 
 namespace.add_task(wheel)

{cmd2-2.5.2 → cmd2-2.5.4}/plugins/template/tasks.py

@@ -170,7 +170,7 @@ namespace_clean.add_task(clean_all, 'all')
 @invoke.task(pre=[clean_all])
 def sdist(context):
     """Create a source distribution"""
-    context.run('python setup.py sdist')
+    context.run('python -m build --sdist')
 
 
 namespace.add_task(sdist)
@@ -179,7 +179,7 @@ namespace.add_task(sdist)
 @invoke.task(pre=[clean_all])
 def wheel(context):
     """Build a wheel distribution"""
-    context.run('python setup.py bdist_wheel')
+    context.run('python -m build --wheel')
 
 
 namespace.add_task(wheel)