Merge branch 'master' into pre-commit

Author: astanin

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.12']
+        python-version: ['3.13']
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/tabulate.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
     runs-on: ${{ matrix.os }}
 

HOWTOPUBLISH

@@ -1,6 +1,6 @@
 # update contributors and CHANGELOG in README
 python -m pre_commit run -a # and then commit changes
-tox -e py39-extra,py310-extra,py311-extra,py312-extra,py313-extra
+tox -e py310-extra,py311-extra,py312-extra,py313-extra,py314-extra
 # tag version release
 python -m build -s # this will update tabulate/version.py
 python -m pip install . # install tabulate in the current venv

README.md

@@ -501,7 +501,7 @@ format:
 
 ```pycon
 >>> print(tabulate(table, headers, tablefmt="asciidoc"))
-[cols="8<,7>",options="header"]
+[cols="<8,>7",options="header"]
 |====
 | item   |   qty
 | spam   |    42

pyproject.toml

@@ -13,14 +13,14 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dynamic = ["version"]
 
 [project.urls]
@@ -32,8 +32,7 @@ widechars = ["wcwidth"]
 [project.scripts]
 tabulate = "tabulate:_main"
 
-[tool.setuptools]
-packages = ["tabulate"]
+# [tool.setuptools]
+# packages = ["tabulate"]
 
 [tool.setuptools_scm]
-write_to = "tabulate/version.py"

tabulate/__init__.py

@@ -142,8 +142,10 @@ def _pipe_line_with_colons(colwidths, colaligns):
     alignment (as in `pipe` output format)."""
     if not colaligns:  # e.g. printing an empty data frame (github issue #15)
         colaligns = [""] * len(colwidths)
-    segments = [_pipe_segment_with_colons(a, w) for a, w in zip(colaligns, colwidths)]
-    return "|" + "|".join(segments) + "|"
+    segments = "|".join(
+        _pipe_segment_with_colons(a, w) for a, w in zip(colaligns, colwidths)
+    )
+    return f"|{segments}|"
 
 
 def _grid_segment_with_colons(colwidth, align):
@@ -165,8 +167,10 @@ def _grid_line_with_colons(colwidths, colaligns):
     in a grid table."""
     if not colaligns:
         colaligns = [""] * len(colwidths)
-    segments = [_grid_segment_with_colons(w, a) for a, w in zip(colaligns, colwidths)]
-    return "+" + "+".join(segments) + "+"
+    segments = "+".join(
+        _grid_segment_with_colons(w, a) for a, w in zip(colaligns, colwidths)
+    )
+    return f"+{segments}+"
 
 
 def _mediawiki_row_with_attrs(separator, cell_values, colwidths, colaligns):
@@ -188,8 +192,8 @@ def _mediawiki_row_with_attrs(separator, cell_values, colwidths, colaligns):
 def _textile_row_with_attrs(cell_values, colwidths, colaligns):
     cell_values[0] += " "
     alignment = {"left": "<.", "right": ">.", "center": "=.", "decimal": ">."}
-    values = (alignment.get(a, "") + v for a, v in zip(colaligns, cell_values))
-    return "|" + "|".join(values) + "|"
+    values = "|".join(alignment.get(a, "") + v for a, v in zip(colaligns, cell_values))
+    return f"|{values}|"
 
 
 def _html_begin_table_without_header(colwidths_ignore, colaligns_ignore):
@@ -259,7 +263,7 @@ def make_header_line(is_header, colwidths, colaligns):
             colwidths, [alignment[colalign] for colalign in colaligns]
         )
         asciidoc_column_specifiers = [
-            f"{width:d}{align}" for width, align in asciidoc_alignments
+            f"{align}{width:d}" for width, align in asciidoc_alignments
         ]
         header_list = ['cols="' + (",".join(asciidoc_column_specifiers)) + '"']
 
@@ -270,7 +274,8 @@ def make_header_line(is_header, colwidths, colaligns):
             options_list.append("header")
 
         if options_list:
-            header_list += ['options="' + ",".join(options_list) + '"']
+            options_list = ",".join(options_list)
+            header_list.append(f'options="{options_list}"')
 
         # generate the list of entries in the table header field
 
@@ -1352,12 +1357,18 @@ def _format(val, valtype, floatfmt, intfmt, missingval="", has_invisible=True):
         is_a_colored_number = has_invisible and isinstance(val, (str, bytes))
         if is_a_colored_number:
             raw_val = _strip_ansi(val)
-            formatted_val = format(float(raw_val), floatfmt)
+            try:
+                formatted_val = format(float(raw_val), floatfmt)
+            except (ValueError, TypeError):
+                return f"{val}"
             return val.replace(raw_val, formatted_val)
         else:
             if isinstance(val, str) and "," in val:
                 val = val.replace(",", "")  # handle thousands-separators
-            return format(float(val), floatfmt)
+            try:
+                return format(float(val), floatfmt)
+            except (ValueError, TypeError):
+                return f"{val}"
     else:
         return f"{val}"
 
@@ -1480,7 +1491,7 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"):
     index = None
     if hasattr(tabular_data, "keys") and hasattr(tabular_data, "values"):
         # dict-like and pandas.DataFrame?
-        if hasattr(tabular_data.values, "__call__"):
+        if callable(tabular_data.values):
             # likely a conventional dict
             keys = tabular_data.keys()
             try:
@@ -1644,6 +1655,10 @@ def _wrap_text_to_colwidths(
     list_of_lists,
     colwidths,
     numparses=True,
+<<<<<<< pre-commit
+=======
+    missingval=_DEFAULT_MISSINGVAL,
+>>>>>>> master
     break_long_words=_BREAK_LONG_WORDS,
     break_on_hyphens=_BREAK_ON_HYPHENS,
 ):
@@ -1668,7 +1683,21 @@ def _wrap_text_to_colwidths(
                     break_long_words=break_long_words,
                     break_on_hyphens=break_on_hyphens,
                 )
+<<<<<<< pre-commit
                 casted_cell = str(cell)
+=======
+                # Cast based on our internal type handling. Any future custom
+                # formatting of types (such as datetimes) may need to be more
+                # explicit than just `str` of the object. Also doesn't work for
+                # custom floatfmt/intfmt, nor with any missing/blank cells.
+                casted_cell = (
+                    missingval
+                    if cell is None
+                    else str(cell)
+                    if cell == "" or _isnumber(cell)
+                    else str(_type(cell, numparse)(cell))
+                )
+>>>>>>> master
                 wrapped = [
                     "\n".join(wrapper.wrap(line))
                     for line in casted_cell.splitlines()
@@ -2226,8 +2255,8 @@ def tabulate(
     Tabulate will, by default, set the width of each column to the length of the
     longest element in that column. However, in situations where fields are expected
     to reasonably be too long to look good as a single line, tabulate can help automate
-    word wrapping long fields for you. Use the parameter `maxcolwidth` to provide a
-    list of maximal column widths
+    word wrapping long fields for you. Use the parameter `maxcolwidths` to provide a
+    list of maximal column widths:
 
     >>> print(tabulate( \
           [('1', 'John Smith', \
@@ -2244,7 +2273,7 @@ def tabulate(
     |            |            | better if it is wrapped a bit |
     +------------+------------+-------------------------------+
 
-    Header column width can be specified in a similar way using `maxheadercolwidth`
+    Header column width can be specified in a similar way using `maxheadercolwidths`.
 
     """
 
@@ -2273,12 +2302,16 @@ def tabulate(
             list_of_lists,
             maxcolwidths,
             numparses=numparses,
+<<<<<<< pre-commit
+=======
+            missingval=missingval,
+>>>>>>> master
             break_long_words=break_long_words,
             break_on_hyphens=break_on_hyphens,
         )
 
     if maxheadercolwidths is not None:
-        num_cols = len(list_of_lists[0])
+        num_cols = len(list_of_lists[0]) if list_of_lists else len(headers)
         if isinstance(maxheadercolwidths, int):  # Expand scalar for all columns
             maxheadercolwidths = _expand_iterable(
                 maxheadercolwidths, num_cols, maxheadercolwidths
@@ -2291,6 +2324,10 @@ def tabulate(
             [headers],
             maxheadercolwidths,
             numparses=numparses,
+<<<<<<< pre-commit
+=======
+            missingval=missingval,
+>>>>>>> master
             break_long_words=break_long_words,
             break_on_hyphens=break_on_hyphens,
         )[0]
@@ -2535,7 +2572,7 @@ def _build_row(padded_cells, colwidths, colaligns, rowfmt):
     "Return a string which represents a row of data cells."
     if not rowfmt:
         return None
-    if hasattr(rowfmt, "__call__"):
+    if callable(rowfmt):
         return rowfmt(padded_cells, colwidths, colaligns)
     else:
         return _build_simple_row(padded_cells, rowfmt)
@@ -2586,7 +2623,7 @@ def _build_line(colwidths, colaligns, linefmt):
     "Return a string which represents a horizontal line."
     if not linefmt:
         return None
-    if hasattr(linefmt, "__call__"):
+    if callable(linefmt):
         return linefmt(colwidths, colaligns)
     else:
         begin, fill, sep, end = linefmt
@@ -2758,13 +2795,16 @@ def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
 
         # If we're allowed to break long words, then do so: put as much
         # of the next chunk onto the current line as will fit.
-        if self.break_long_words:
+        if self.break_long_words and space_left > 0:
             # Tabulate Custom: Build the string up piece-by-piece in order to
             # take each charcter's width into account
             chunk = reversed_chunks[-1]
             i = 1
             # Only count printable characters, so strip_ansi first, index later.
-            while len(_strip_ansi(chunk)[:i]) <= space_left:
+            stripped_chunk = _strip_ansi(chunk)
+            while (
+                i <= len(stripped_chunk) and self._len(stripped_chunk[:i]) <= space_left
+            ):
                 i = i + 1
             # Consider escape codes when breaking words up
             total_escape_len = 0

test/test_input.py

@@ -173,7 +173,7 @@ def test_numpy_record_array():
             [("Alice", 23, 169.5), ("Bob", 27, 175.0)],
             dtype={
                 "names": ["name", "age", "height"],
-                "formats": ["a32", "uint8", "float32"],
+                "formats": ["S32", "uint8", "float32"],
             },
         )
         expected = "\n".join(
@@ -199,7 +199,7 @@ def test_numpy_record_array_keys():
             [("Alice", 23, 169.5), ("Bob", 27, 175.0)],
             dtype={
                 "names": ["name", "age", "height"],
-                "formats": ["a32", "uint8", "float32"],
+                "formats": ["S32", "uint8", "float32"],
             },
         )
         expected = "\n".join(
@@ -225,7 +225,7 @@ def test_numpy_record_array_headers():
             [("Alice", 23, 169.5), ("Bob", 27, 175.0)],
             dtype={
                 "names": ["name", "age", "height"],
-                "formats": ["a32", "uint8", "float32"],
+                "formats": ["S32", "uint8", "float32"],
             },
         )
         expected = "\n".join(
@@ -313,6 +313,7 @@ def test_sqlite3():
             cursor.execute("INSERT INTO people VALUES (?, ?, ?)", values)
         cursor.execute("SELECT name, age, height FROM people ORDER BY name")
         result = tabulate(cursor, headers=["whom", "how old", "how tall"])
+        conn.close()
         expected = """\
 whom      how old    how tall
 ------  ---------  ----------
@@ -337,6 +338,7 @@ def test_sqlite3_keys():
             'SELECT name "whom", age "how old", height "how tall" FROM people ORDER BY name'
         )
         result = tabulate(cursor, headers="keys")
+        conn.close()
         expected = """\
 whom      how old    how tall
 ------  ---------  ----------

test/test_output.py

@@ -2101,7 +2101,7 @@ def test_asciidoc():
     "Output: asciidoc with headers"
     expected = "\n".join(
         [
-            '[cols="11<,11>",options="header"]',
+            '[cols="<11,>11",options="header"]',
             "|====",
             "| strings   |   numbers ",
             "| spam      |   41.9999 ",
@@ -2117,7 +2117,7 @@ def test_asciidoc_headerless():
     "Output: asciidoc without headers"
     expected = "\n".join(
         [
-            '[cols="6<,10>"]',
+            '[cols="<6,>10"]',
             "|====",
             "| spam |  41.9999 ",
             "| eggs | 451      ",

test/test_regression.py

@@ -258,15 +258,18 @@ def test_alignment_of_decimal_numbers_with_ansi_color():
 
 def test_alignment_of_decimal_numbers_with_commas():
     "Regression: alignment for decimal numbers with comma separators"
-    skip("test is temporarily disable until the feature is reimplemented")
-    # table = [["c1r1", "14502.05"], ["c1r2", 105]]
-    # result = tabulate(table, tablefmt="grid", floatfmt=',.2f')
-    # expected = "\n".join(
-    #    ['+------+-----------+', '| c1r1 | 14,502.05 |',
-    #    '+------+-----------+', '| c1r2 |    105.00 |',
-    #    '+------+-----------+']
-    # )
-    # assert_equal(expected, result)
+    table = [["c1r1", "14502.05"], ["c1r2", 105]]
+    result = tabulate(table, tablefmt="grid", floatfmt=",.2f")
+    expected = "\n".join(
+        [
+            "+------+-----------+",
+            "| c1r1 | 14,502.05 |",
+            "+------+-----------+",
+            "| c1r2 |    105.00 |",
+            "+------+-----------+",
+        ]
+    )
+    assert_equal(expected, result)
 
 
 def test_long_integers():
@@ -545,3 +548,22 @@ def test_empty_table_with_colalign():
         ]
     )
     assert_equal(expected, table)
+
+
+def test_empty_table_with_maxheadercolwidths():
+    "Regression: empty table with maxheadercolwidths kwarg (issue #365)"
+    result = tabulate([], headers=["one", "two", "three"], maxheadercolwidths=5)
+    expected = "\n".join(
+        [
+            "one    two    three",
+            "-----  -----  -------",
+        ]
+    )
+    assert_equal(expected, result)
+
+
+def test_mixed_bool_strings_and_numeric_strings():
+    "Regression: column with bool-like strings and numeric strings should not crash (issue #209)"
+    result = tabulate([["False"], ["1."]])
+    expected = "\n".join(["-----", "False", "    1", "-----"])
+    assert_equal(expected, result)