cmdkit 2.7.3__tar.gz → 2.7.5__tar.gz

{cmdkit-2.7.3 → cmdkit-2.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdkit
-Version: 2.7.3
+Version: 2.7.5
 Summary: A command-line utility toolkit for Python.
 Home-page: https://cmdkit.readthedocs.io
 License: Apache-2.0
@@ -16,9 +16,10 @@ 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: Topic :: Software Development :: Libraries :: Application Frameworks
-Requires-Dist: pyyaml (>=5.3.1)
-Requires-Dist: toml (>=0.10.1)
+Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
+Requires-Dist: toml (>=0.10.2,<0.11.0)
 Project-URL: Documentation, https://cmdkit.readthedocs.io
 Project-URL: Repository, https://github.com/glentner/cmdkit
 Description-Content-Type: text/x-rst

{cmdkit-2.7.3 → cmdkit-2.7.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmdkit"
-version = "2.7.3"
+version = "2.7.5"
 description = "A command-line utility toolkit for Python."
 readme = "README.rst"
 license = "Apache-2.0"
@@ -20,35 +20,37 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: Apache Software License",
 ]
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-toml = {version = ">=0.10.1", optional = true}
-pyyaml = {version = ">=5.3.1", optional = true}
+toml = {version = "^0.10.2", optional = true}
+pyyaml = {version = "^6.0.1", optional = true}
 
 [tool.poetry.group.docs.dependencies]
-sphinx = ">=3.2.1"
-pydata-sphinx-theme = ">=0.4.1"
-sphinx-sitemap = "^2.5.0"
+sphinx = "^7.2.6"
+sphinx-sitemap = "^2.5.1"
 sphinx-autobuild = "^2021.3.14"
-sphinxext-opengraph = "^0.8.2"
 sphinx-copybutton = "^0.5.2"
+sphinxext-opengraph = "^0.9.1"
 sphinxcontrib-details-directive = "^0.1.0"
-sphinx-toolbox = "^3.4.0"
+sphinx-toolbox = "^3.5.0"
+pydata-sphinx-theme = "^0.15.1"
 enum-tools = {extras = ["sphinx"], version = "^0.10.0"}
 
 [tool.poetry.group.dev.dependencies]
-toml = ">=0.10.1"
-pyyaml = ">=5.3.1"
-pytest = ">=6.1.1"
-pytest-cov = ">=2.10.1"
-hypothesis = ">=5.18.0"
-pylint = ">=2.6.0"
-mypy = ">=0.790"
-ipython = ">=7.18.1"
-sphinx-autobuild = ">=2020.9.1"
+toml = "^0.10.2"
+pyyaml = "^6.0.1"
+pytest = "^7.4.4"
+pytest-cov = "^4.1.0"
+hypothesis = "^6.92.6"
+ruff = "^0.1.11"
+pyright = "^1.1.345"
+pynvim = "^0.5.0"
+ipython = "^8.20.0"
+sphinx-autobuild = "^2021.3.14"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

{cmdkit-2.7.3 → cmdkit-2.7.5}/src/cmdkit/ansi.py

@@ -99,8 +99,9 @@ def colorize_usage(text: str) -> str:
         return _apply_formatters(text,
                                  _format_headers,
                                  _format_options,
-                                 _format_special_args,
-                                 _format_special_marker,
+                                 _format_special_device,
+                                 _format_special_metavars,
+                                 _format_special_reserved_names,
                                  _format_single_quoted_string,
                                  _format_double_quoted_string,
                                  _format_backtick_string,
@@ -127,28 +128,32 @@ NOT_QUOTED = (
 
 def _format_headers(text: str) -> str:
     """Add rich ANSI formatting to section headers."""
-    names = ['Usage', 'Commands', 'Arguments', 'Modes', 'Options', 'Files']
-    return re.sub(r'(?P<name>' + '|'.join(names) + r'):' + NOT_QUOTED, bold(r'\g<name>:'), text)
+    return re.sub(r'^(?P<name>[A-Z][a-z]+):' + NOT_QUOTED, bold(r'\g<name>:'),
+                  text, flags=re.MULTILINE)
 
 
 def _format_options(text: str) -> str:
     """Add rich ANSI formatting to option syntax."""
-    option_pattern = r'(?P<leader>[ /\[,])(?P<option>-[a-zA-Z]|--[a-z]+(-[a-z]+)?)\b'
+    option_pattern = r'(?P<leader>[ /\[,])(?P<option>-[a-zA-Z]+|--[a-z]+(-[a-z]+)?)\b'
     return re.sub(option_pattern + NOT_QUOTED, r'\g<leader>' + cyan(r'\g<option>'), text)
 
 
-def _format_special_args(text: str) -> str:
+def _format_special_metavars(text: str) -> str:
     """Add rich ANSI formatting to special argument syntax."""
-    metavars = ['FILE', 'PATH', 'ARGS', 'ID', 'NUM', 'CMD', 'SIZE', 'SEC', 'NAME', 'TEMPLATE', 'CHAR', 'MODE',
-                'ADDR', 'HOST', 'PORT', 'KEY', 'SECTION', 'VAR', 'VALUE', 'FIELD', 'COND', 'FORMAT', 'TAG']
-    metavars_pattern = r'\b(?P<arg>' + '|'.join(metavars) + r')\b'
+    metavars_pattern = r'(?<!-)\b(?P<arg>[A-Z]{2,})\b'
     return re.sub(metavars_pattern + NOT_QUOTED, italic(r'\g<arg>'), text)
 
 
-def _format_special_marker(text: str) -> str:
-    """Add rich ANSI formatting to special markers (e.g., '<stdout>')."""
-    args = ['<stdout>', '<stderr>', '<stdin>', '<devnull>', '<none>', '<command>', '<args>', ]
-    return re.sub(r'(?P<arg>' + '|'.join(args) + r')' + NOT_QUOTED, italic(r'\g<arg>'), text)
+def _format_special_device(text: str) -> str:
+    """Add rich ANSI formatting to special device/resource names (e.g., '<stdout>')."""
+    return re.sub(r'(?P<arg><[a-z]{3,}>)' + NOT_QUOTED, italic(r'\g<arg>'), text)
+
+
+def _format_special_reserved_names(text: str) -> str:
+    """Special reserved names (e.g., localhost)."""
+    names = ['localhost', 'stdin', 'stdout', 'stderr', ]
+    names_pattern = r'(?<!-)\b(?P<name>' + '|'.join(names) + r')\b'
+    return re.sub(names_pattern + NOT_QUOTED, italic(r'\g<name>'), text)
 
 
 def _format_single_quoted_string(text: str) -> str:
@@ -168,4 +173,5 @@ def _format_backtick_string(text: str) -> str:
 
 def _format_digit(text: str) -> str:
     """Add rich ANSI formatting to numerical digits."""
-    return re.sub(r'\b(?P<num>\d+|null|NULL)\b' + NOT_QUOTED, green(r'\g<num>'), text)
+    return re.sub(r'\b(?P<num>\d+\.?[kmgtKMGT]?[bB]?|null|NULL)\b' + NOT_QUOTED,
+                  green(r'\g<num>'), text)