Merge branch 'master' into 3.0.0 - uv venv support

Author: tleonhardt

docs/conf.py

@@ -23,10 +23,13 @@
 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,13 +182,17 @@
 # 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', 'ArgparseCommandFunc'),
+    ('py:class', 'argparse._SubParsersAction'),
     ('py:class', 'cmd2.decorators.CommandParent'),
-    ('py:obj', 'cmd2.decorators.CommandParent'),
     ('py:class', 'cmd2.decorators.CommandParentType'),
-    ('py:class', 'argparse._SubParsersAction'),
     ('py:class', 'cmd2.utils._T'),
-    ('py:class', 'types.FrameType'),
+    ('py:class', 'CommandParent'),
+    ('py:class', 'frame'),
+    ('py:class', 'RawCommandFuncOptionalBoolReturn'),
     ('py:class', 'rich.console.Console'),
     ('py:class', 'rich.console.ConsoleRenderable'),
     ('py:class', 'rich.console.RichCast'),
+    ('py:class', 'types.FrameType'),
+    ('py:obj', 'cmd2.decorators.CommandParent'),
 ]

pyproject.toml

@@ -58,17 +58,17 @@ dev = [
     "pytest-cov",
     "pytest-mock",
     "sphinx",
-    "sphinx-rtd-theme",
     "sphinx-autobuild",
+    "sphinx-rtd-theme",
     "ruff",
     "twine",
 ]
 docs = [
     "setuptools",
     "setuptools_scm",
     "sphinx",
-    "sphinx-rtd-theme",
     "sphinx-autobuild",
+    "sphinx-rtd-theme",
 ]
 test = [
     "codecov",
@@ -309,3 +309,19 @@ docstring-code-line-length = "dynamic"
 packages = ["cmd2"]
 
 [tool.setuptools_scm]
+
+[tool.uv]
+dev-dependencies = [
+    "codecov",
+    "doc8",
+    "invoke",
+    "mypy",
+    "pytest",
+    "pytest-cov",
+    "pytest-mock",
+    "sphinx",
+    "sphinx-autobuild",
+    "sphinx-rtd-theme",
+    "ruff",
+    "twine",
+]

tests/test_utils.py

@@ -290,9 +290,9 @@ def test_proc_reader_send_sigint(pr_none):
     assert pr_none._proc.poll() is None
     pr_none.send_sigint()
     pr_none.wait()
-
-    # Mac sure a SIGINT killed the process
     ret_code = pr_none._proc.poll()
+
+    # Make sure a SIGINT killed the process
     if sys.platform.startswith('win'):
         assert ret_code is not None
     else: