[rpms/python-cli-helpers] f43: 2.12.0

[rpms/python-cli-helpers] f43: 2.12.0

[@ 2026-09-02 16:22 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/python-cli-helpers
Branch : f43
Commit : ed26eca83fd329d94e33efabacf7e19a22949639
Author : Terje Røsten <terjeros@gmail.com>
Date   : 2026-03-22T20:09:18+01:00
Stats  : +32/-56 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/python-cli-helpers/c/ed26eca83fd329d94e33efabacf7e19a22949639?branch=f43

Log:
2.12.0

---
diff --git a/.gitignore b/.gitignore
index 3c0f2a0..c6f9f22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /cli_helpers-2.10.0.tar.gz
 /cli_helpers-2.10.1.tar.gz
 /cli_helpers-2.11.0.tar.gz
+/cli_helpers-2.12.0.tar.gz

diff --git a/0001-Allow-tabulate-0.9.0.patch b/0001-Allow-tabulate-0.9.0.patch
new file mode 100644
index 0000000..6b9d5b2
--- /dev/null
+++ b/0001-Allow-tabulate-0.9.0.patch
@@ -0,0 +1,25 @@
+From 9aa10c1657891aa87c36c801c7cb87b6634bf3bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terjeros@gmail.com>
+Date: Sun, 22 Mar 2026 20:06:44 +0100
+Subject: [PATCH] Allow tabulate 0.9.0
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 5c870ce..16ecf5b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -37,7 +37,7 @@ setup(
+     long_description_content_type="text/x-rst",
+     install_requires=[
+         "configobj >= 5.0.5",
+-        "tabulate[widechars] ~= 0.10.0",
++        "tabulate[widechars] >= 0.9.0",
+     ],
+     extras_require={
+         "styles": ["Pygments >= 1.6"],
+-- 
+2.53.0
+

diff --git a/0001-Forward-port-tabulate-0.10.0-patch.patch b/0001-Forward-port-tabulate-0.10.0-patch.patch
deleted file mode 100644
index 0838bec..0000000
--- a/0001-Forward-port-tabulate-0.10.0-patch.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From c86d1d7996d01ef456e965b1ceeb7ea4ecc78946 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terjeros@gmail.com>
-Date: Mon, 9 Mar 2026 18:31:54 +0100
-Subject: [PATCH] Forward port tabulate 0.10.0 patch
-
----
- cli_helpers/tabular_output/tabulate_adapter.py | 6 +++++-
- setup.py                                       | 3 ++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/cli_helpers/tabular_output/tabulate_adapter.py b/cli_helpers/tabular_output/tabulate_adapter.py
-index cf32da5..0872a3d 100644
---- a/cli_helpers/tabular_output/tabulate_adapter.py
-+++ b/cli_helpers/tabular_output/tabulate_adapter.py
-@@ -21,6 +21,7 @@ from .preprocessors import (
-     escape_newlines,
- )
- 
-+from packaging.version import Version
- import tabulate
- 
- 
-@@ -249,7 +250,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 Version(tabulate.__version__) < Version("0.10.0"):
-+        tabulate.PRESERVE_WHITESPACE = preserve_whitespace
-+    else:
-+        tkwargs.update(preserve_whitespace=preserve_whitespace)
- 
-     tkwargs.update(default_kwargs.get(table_format, {}))
-     if table_format in headless_formats:
-diff --git a/setup.py b/setup.py
-index 5c870ce..f02c970 100755
---- a/setup.py
-+++ b/setup.py
-@@ -37,7 +37,8 @@ setup(
-     long_description_content_type="text/x-rst",
-     install_requires=[
-         "configobj >= 5.0.5",
--        "tabulate[widechars] ~= 0.10.0",
-+        "packaging",
-+        "tabulate[widechars] >= 0.9.0",
-     ],
-     extras_require={
-         "styles": ["Pygments >= 1.6"],
--- 
-2.53.0
-

diff --git a/python-cli-helpers.spec b/python-cli-helpers.spec
index b95f6ac..c4da523 100644
--- a/python-cli-helpers.spec
+++ b/python-cli-helpers.spec
@@ -2,15 +2,13 @@
 
 Summary:        Python helpers for common CLI tasks
 Name:           python-cli-helpers
-Version:        2.11.0
+Version:        2.12.0
 Release:        1%{?dist}
 # Automatically converted from old format: BSD - review is highly recommended.
 License:        LicenseRef-Callaway-BSD
 URL:            https://github.com/dbcli/cli_helpers
 Source0:        https://github.com/dbcli/cli_helpers/archive/v%{version}/cli_helpers-%{version}.tar.gz
-# Fix compatibility with tabulate 0.9.0, after merge of
-# https://github.com/dbcli/cli_helpers/pull/107
-Patch:          0001-Forward-port-tabulate-0.10.0-patch.patch
+Patch:          0001-Allow-tabulate-0.9.0.patch
 BuildArch:      noarch
 BuildRequires:  python3-configobj
 BuildRequires:  python3-devel
@@ -57,6 +55,9 @@ PYTHONPATH=build/lib/ py.test-3
 %doc AUTHORS CHANGELOG README.rst
 
 %changelog
+* Sun Mar 22 2026 Terje Rosten <terjeros@gmail.com> - 2.12.0-1
+- 2.12.0
+
 * Sun Mar 08 2026 Terje Rosten <terjeros@gmail.com> - 2.11.0-1
 - 2.11.0
 

diff --git a/sources b/sources
index 453d527..c4bc30c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cli_helpers-2.11.0.tar.gz) = a7fdb6eb012ac5157a305f69ddf6a0110b945573da585b3152546b4832d97686a40f853b2101ef1cce752ebb3dc8b078ce26f3eb701c7963ad811ed28dca4f9e
+SHA512 (cli_helpers-2.12.0.tar.gz) = fc774d7ec102952f3bc07cf87214e01379890bb9ac132e20eaf18df13fffddf2b3c2be1e0889ba8b3e7781aea12aef345f21f6878500d64b285daad730eba1b3