cli-helpers 2.11.0__tar.gz → 2.13.0__tar.gz

{cli_helpers-2.11.0 → cli_helpers-2.13.0}/CHANGELOG

@@ -1,15 +1,28 @@
 # Changelog
 
+## Version 2.13.0
+
+(released on 2026-04-13)
+
+- Pin Pygments library to older version v2.19.2 to fix tests.
+- Fix dates in changelog.
+
+## Version 2.12.0
+
+(released on 2026-03-21)
+
+- Probe tabulate version for `preserve_whitespace` keyword support.
+
 ## Version 2.11.0
 
-(released on 2025-03-05)
+(released on 2026-03-05)
 
 - Support and require version 0.10.x of `tabulate`.
 - Pin `tabulate` version more tightly.
 
 ## Version 2.10.1
 
-(released on 2025-02-18)
+(released on 2026-02-18)
 
 - Update license dates.
 - Change `master` branch references to `main`.

{cli_helpers-2.11.0/cli_helpers.egg-info → cli_helpers-2.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli_helpers
-Version: 2.11.0
+Version: 2.13.0
 Summary: Helpers for building command-line apps
 Home-page: https://github.com/dbcli/cli_helpers
 Author: dbcli
@@ -22,7 +22,7 @@ License-File: AUTHORS
 Requires-Dist: configobj>=5.0.5
 Requires-Dist: tabulate[widechars]~=0.10.0
 Provides-Extra: styles
-Requires-Dist: Pygments>=1.6; extra == "styles"
+Requires-Dist: Pygments~=2.19.2; extra == "styles"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

cli_helpers-2.13.0/cli_helpers/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.13.0"

{cli_helpers-2.11.0 → cli_helpers-2.13.0}/cli_helpers/tabular_output/tabulate_adapter.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import os
 
-from cli_helpers.utils import filter_dict_by_key
+from cli_helpers.utils import filter_dict_by_key, version_as_tuple
 from cli_helpers.compat import (
     Terminal256Formatter,
     TerminalTrueColorFormatter,
@@ -141,6 +141,10 @@ default_kwargs = {
 headless_formats = ("minimal",)
 
 
+def has_new_preserve_whitespace_arg():
+    return version_as_tuple(tabulate.__version__) >= (0, 10, 0)
+
+
 def get_preprocessors(format_name):
     common_formatters = (
         override_missing_value,
@@ -249,7 +253,10 @@ def adapter(data, headers, table_format=None, preserve_whitespace=False, **kwarg
     if table_format in supported_markup_formats:
         tkwargs.update(numalign=None, stralign=None)
 
-    tkwargs.update(preserve_whitespace=preserve_whitespace)
+    if has_new_preserve_whitespace_arg():
+        tkwargs.update(preserve_whitespace=preserve_whitespace)
+    else:
+        tabulate.PRESERVE_WHITESPACE = preserve_whitespace
 
     tkwargs.update(default_kwargs.get(table_format, {}))
     if table_format in headless_formats:

{cli_helpers-2.11.0 → cli_helpers-2.13.0}/cli_helpers/utils.py

@@ -5,7 +5,7 @@ import binascii
 import os
 import re
 from functools import lru_cache
-from typing import Dict, Union
+from typing import Dict, Tuple, Union
 
 from typing import TYPE_CHECKING
 
@@ -146,3 +146,15 @@ def filter_style_table(style: "StyleMeta", *relevant_styles: str) -> Dict:
     _styles_iter = ((key, val) for key, val in getattr(style, "styles", {}).items())
     _relevant_styles_iter = filter(lambda tpl: tpl[0] in relevant_styles, _styles_iter)
     return {key: val for key, val in _relevant_styles_iter}
+
+
+@lru_cache()
+def version_as_tuple(version: str) -> Tuple:
+    try:
+        list_s = [re.sub(r'(rc|alpha|beta|test|dev|post).*$', '', x) for x in version.split('.')]
+        list_s = [re.sub(r'[^\d]', '', x) for x in list_s]
+        list_i = [int(x) for x in list_s if x]
+        list_i.extend([0, 0, 0])
+        return tuple(list_i[:3])
+    except ValueError:
+        return (0, 0, 0)

{cli_helpers-2.11.0 → cli_helpers-2.13.0/cli_helpers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli_helpers
-Version: 2.11.0
+Version: 2.13.0
 Summary: Helpers for building command-line apps
 Home-page: https://github.com/dbcli/cli_helpers
 Author: dbcli
@@ -22,7 +22,7 @@ License-File: AUTHORS
 Requires-Dist: configobj>=5.0.5
 Requires-Dist: tabulate[widechars]~=0.10.0
 Provides-Extra: styles
-Requires-Dist: Pygments>=1.6; extra == "styles"
+Requires-Dist: Pygments~=2.19.2; extra == "styles"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{cli_helpers-2.11.0 → cli_helpers-2.13.0}/cli_helpers.egg-info/requires.txt

@@ -2,4 +2,4 @@ configobj>=5.0.5
 tabulate[widechars]~=0.10.0
 
 [styles]
-Pygments>=1.6
+Pygments~=2.19.2

{cli_helpers-2.11.0 → cli_helpers-2.13.0}/requirements-dev.txt

@@ -2,7 +2,7 @@ autopep8==1.3.3
 codecov==2.1.13
 coverage==4.3.4
 black>=20.8b1
-Pygments>=2.4.0
+Pygments~=2.19.2
 pytest==7.4.3
 pytest-cov==2.4.0
 Sphinx==1.5.5

{cli_helpers-2.11.0 → cli_helpers-2.13.0}/setup.py

@@ -40,7 +40,7 @@ setup(
         "tabulate[widechars] ~= 0.10.0",
     ],
     extras_require={
-        "styles": ["Pygments >= 1.6"],
+        "styles": ["Pygments ~= 2.19.2"],
     },
     python_requires=">=3.6",
     classifiers=[

{cli_helpers-2.11.0 → cli_helpers-2.13.0}/tests/test_utils.py

@@ -75,3 +75,28 @@ def test_filter_dict_by_key():
     fd = utils.filter_dict_by_key(d, keys)
     assert len(fd) == 1
     assert all([k in keys for k in fd])
+
+
+def test_version_as_tuple_01():
+    """Test version_as_tuple() in the usual case."""
+    assert utils.version_as_tuple('0.10.0') == (0, 10, 0)
+
+
+def test_version_as_tuple_02():
+    """Test version_as_tuple() with leading v."""
+    assert utils.version_as_tuple('v0.10.0') == (0, 10, 0)
+
+
+def test_version_as_tuple_03():
+    """Test version_as_tuple() trailing padding."""
+    assert utils.version_as_tuple('0.10') == (0, 10, 0)
+
+
+def test_version_as_tuple_04():
+    """Test version_as_tuple() stripping rc suffixes."""
+    assert utils.version_as_tuple('0.10.0rc1') == (0, 10, 0)
+
+
+def test_version_as_tuple_05():
+    """Test version_as_tuple() deleting post1 elements."""
+    assert utils.version_as_tuple('0.10.0.post1') == (0, 10, 0)

cli_helpers-2.11.0/cli_helpers/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.11.0"