Avoid including extended version number info; causes problems with venv

Author: pjkundert

Makefile

@@ -14,7 +14,7 @@ export TOX_OPTS		?= -e py39-extra,py310-extra,py311-extra,py312-extra,py313-extr
 export PYTEST		?= $(PYTHON) -m pytest
 export PYTEST_OPTS	?= # -vv --capture=no
 
-VERSION			= $(shell $(PYTHON) -c "exec(open('tabulate/version.py').read()); print('.'.join(map(str, __version_tuple__[:-2])))" )
+VERSION			= $(shell $(PYTHON) -c "exec(open('tabulate/version.py').read()); print('.'.join(map(str, __version_tuple__[:3])))" )
 VERSION_FULL		= $(shell $(PYTHON) -c "exec(open('tabulate/version.py').read()); print(__version__)" )
 WHEEL			= dist/tabulate_slip39-$(VERSION_FULL)-py3-none-any.whl
 VENV			= $(CURDIR)-$(VERSION)-$(PYTHON_V)

pyproject.toml

@@ -37,3 +37,4 @@ packages = ["tabulate"]
 
 [tool.setuptools_scm]
 write_to = "tabulate/version.py"
+local_scheme = "no-local-version"

tabulate/__init__.py

@@ -1638,13 +1638,7 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"):
     return rows, headers, headers_pad
 
 
-def _wrap_text_to_colwidths(
-    list_of_lists,
-    colwidths,
-    numparses=True,
-    break_long_words=_BREAK_LONG_WORDS,
-    break_on_hyphens=_BREAK_ON_HYPHENS,
-):
+def _wrap_text_to_colwidths(list_of_lists, colwidths, numparses=True, break_long_words=_BREAK_LONG_WORDS, break_on_hyphens=_BREAK_ON_HYPHENS):
     if len(list_of_lists):
         num_cols = len(list_of_lists[0])
     else:
@@ -1661,11 +1655,7 @@ def _wrap_text_to_colwidths(
                 continue
 
             if width is not None:
-                wrapper = _CustomTextWrap(
-                    width=width,
-                    break_long_words=break_long_words,
-                    break_on_hyphens=break_on_hyphens,
-                )
+                wrapper = _CustomTextWrap(width=width, break_long_words=break_long_words, break_on_hyphens=break_on_hyphens)
                 casted_cell = str(cell)
                 wrapped = [
                     "\n".join(wrapper.wrap(line))
@@ -2268,11 +2258,7 @@ def tabulate(
 
         numparses = _expand_numparse(disable_numparse, num_cols)
         list_of_lists = _wrap_text_to_colwidths(
-            list_of_lists,
-            maxcolwidths,
-            numparses=numparses,
-            break_long_words=break_long_words,
-            break_on_hyphens=break_on_hyphens,
+            list_of_lists, maxcolwidths, numparses=numparses, break_long_words=break_long_words, break_on_hyphens=break_on_hyphens
         )
 
     if maxheadercolwidths is not None:
@@ -2286,11 +2272,7 @@ def tabulate(
 
         numparses = _expand_numparse(disable_numparse, num_cols)
         headers = _wrap_text_to_colwidths(
-            [headers],
-            maxheadercolwidths,
-            numparses=numparses,
-            break_long_words=break_long_words,
-            break_on_hyphens=break_on_hyphens,
+            [headers], maxheadercolwidths, numparses=numparses, break_long_words=break_long_words, break_on_hyphens=break_on_hyphens
         )[0]
 
     # empty values in the first column of RST tables should be escaped (issue #82)
@@ -2756,45 +2738,29 @@ 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.
-
-        # Reverted the broken ANSI code handling stuff to fix wcwidth handling
-        # - Doesn't use self._lend, infinite loops
-        # - doesn't locate chunks correctly b/c could be split by ANSI codes
-        #
-        # 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]
-        #     # Only count printable characters, so strip_ansi first, index later.
-        #     for i in range( 1, space_left + 1 ):
-        #         if self._len(_strip_ansi(chunk)[:i]) > space_left:
-        #             break
-        #
-        #     # Consider escape codes when breaking words up
-        #     total_escape_len = 0
-        #     last_group = 0
-        #     if _ansi_codes.search(chunk) is not None:
-        #         for group, _, _, _ in _ansi_codes.findall(chunk):
-        #             escape_len = len(group)
-        #             if (
-        #                 group
-        #                 in chunk[last_group : i + total_escape_len + escape_len - 1]
-        #             ):
-        #                 total_escape_len += escape_len
-        #                 found = _ansi_codes.search(chunk[last_group:])
-        #                 last_group += found.end()
-        #     cur_line.append(chunk[: i + total_escape_len - 1])
-        #     reversed_chunks[-1] = chunk[i + total_escape_len - 1 :]
-
-        if self.break_long_words:  # and space_left > 0:
+        if self.break_long_words:
             # 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
-            while self._len(chunk[:i]) <= space_left:
+            # Only count printable characters, so strip_ansi first, index later.
+            while len(_strip_ansi(chunk)[:i]) <= space_left:
                 i = i + 1
-            cur_line.append(chunk[: i - 1])
-            reversed_chunks[-1] = chunk[i - 1 :]
+            # Consider escape codes when breaking words up
+            total_escape_len = 0
+            last_group = 0
+            if _ansi_codes.search(chunk) is not None:
+                for group, _, _, _ in _ansi_codes.findall(chunk):
+                    escape_len = len(group)
+                    if (
+                        group
+                        in chunk[last_group : i + total_escape_len + escape_len - 1]
+                    ):
+                        total_escape_len += escape_len
+                        found = _ansi_codes.search(chunk[last_group:])
+                        last_group += found.end()
+            cur_line.append(chunk[: i + total_escape_len - 1])
+            reversed_chunks[-1] = chunk[i + total_escape_len - 1 :]
 
         # Otherwise, we have to preserve the long word intact.  Only add
         # it to the current line if there's nothing already there --