tableio 0.9__tar.gz → 1.1__tar.gz

{tableio-0.9/tableio.egg-info → tableio-1.1}/PKG-INFO

@@ -1,24 +1,26 @@
 Metadata-Version: 2.4
 Name: tableio
-Version: 0.9
+Version: 1.1
 Summary: Uniform way to write table data to and read from different file formats
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
 License-Expression: MIT
-Project-URL: Source code, https://bitbucket.org/tom-bjorkholm/table-io
+Project-URL: Source code, https://github.com/tom-bjorkholm/table-io
+Project-URL: Documentation, https://github.com/tom-bjorkholm/table-io/blob/master/doc/
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
+Classifier: Intended Audience :: Developers
+Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pip>=26.1.1
-Requires-Dist: setuptools>=82.0.1
-Requires-Dist: build>=1.5.0
-Requires-Dist: wheel>=0.47.0
-Requires-Dist: mformat-ext>=0.6
+Requires-Dist: mformat-ext>=0.7
 Requires-Dist: openpyxl>=3.1.5
-Requires-Dist: types-openpyxl>=3.1.5.20260402
-Requires-Dist: odfdo>=3.22.7
+Requires-Dist: types-openpyxl>=3.1.5.20260518
+Requires-Dist: odfdo>=3.22.10
 Requires-Dist: xlsxwriter>=3.2.9
 Requires-Dist: pylightxl>=1.61
 Dynamic: author
@@ -121,13 +123,13 @@ The main features are:
 
 The best way to learn to use this package is to use the provided
 example programs:
-[https://bitbucket.org/tom-bjorkholm/table-io/src/master/example/src/example/README.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/example/src/example/README.md).
+[https://github.com/tom-bjorkholm/table-io/blob/master/example/src/example/README.md](https://github.com/tom-bjorkholm/table-io/blob/master/example/src/example/README.md).
 
 ## API documentation
 
-You can find the public API documentation at [https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/api.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/api.md)
+You can find the public API documentation at [https://github.com/tom-bjorkholm/table-io/blob/master/doc/api.md](https://github.com/tom-bjorkholm/table-io/blob/master/doc/api.md)
 
-You can find the protected API documentation at [https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/protected_api.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/protected_api.md)
+You can find the protected API documentation at [https://github.com/tom-bjorkholm/table-io/blob/master/doc/protected_api.md](https://github.com/tom-bjorkholm/table-io/blob/master/doc/protected_api.md)
 The protected API documentation is only for developers that want to
 extend the framework by adding their own classes as registered
 readers/writers to the factory.
@@ -137,9 +139,9 @@ a better start by reading the examples.
 
 ## Test summary
 
-- Test result: 1344 passed in 20s
+- Test result: 1347 passed in 20s
 - No flake8 warnings.
 - No mypy errors found.
 - No python layout warnings.
-- Built version(s): 0.9
-- Build and test using Python 3.14.4
+- Built version(s): 1.1
+- Build and test using Python 3.14.6

{tableio-0.9 → tableio-1.1}/README.md

@@ -29,7 +29,7 @@ formulas in the received spreadsheet).
 The tableio repo uses submodules. To clone it use the command:
 
 ````sh
-git clone --recurse-submodules git@bitbucket.org:tom-bjorkholm/table-io.git
+git clone --recurse-submodules git@github.com:tom-bjorkholm/table-io.git
 ````
 
 If you forgot to include the `--recurse-submodules` in your `git clone` command
@@ -89,13 +89,13 @@ reports.
 
 The file `./common_build_tools/README.md` (in git submodule - see above) contains more
 information about the build system. This README can also be viewed at
-[https://bitbucket.org/tom-bjorkholm/common_build_tools/src/master/README.md](https://bitbucket.org/tom-bjorkholm/common_build_tools/src/master/README.md)
+[https://github.com/tom-bjorkholm/common_build_tools/blob/master/README.md](https://github.com/tom-bjorkholm/common_build_tools/blob/master/README.md)
 
 ## Test summary
 
-- Test result: 1344 passed in 20s
+- Test result: 1347 passed in 20s
 - No flake8 warnings.
 - No mypy errors found.
 - No python layout warnings.
-- Built version(s): 0.9
-- Build and test using Python 3.14.4
+- Built version(s): 1.1
+- Build and test using Python 3.14.6

{tableio-0.9 → tableio-1.1}/README_pypi.md

@@ -93,13 +93,13 @@ The main features are:
 
 The best way to learn to use this package is to use the provided
 example programs:
-[https://bitbucket.org/tom-bjorkholm/table-io/src/master/example/src/example/README.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/example/src/example/README.md).
+[https://github.com/tom-bjorkholm/table-io/blob/master/example/src/example/README.md](https://github.com/tom-bjorkholm/table-io/blob/master/example/src/example/README.md).
 
 ## API documentation
 
-You can find the public API documentation at [https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/api.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/api.md)
+You can find the public API documentation at [https://github.com/tom-bjorkholm/table-io/blob/master/doc/api.md](https://github.com/tom-bjorkholm/table-io/blob/master/doc/api.md)
 
-You can find the protected API documentation at [https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/protected_api.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/protected_api.md)
+You can find the protected API documentation at [https://github.com/tom-bjorkholm/table-io/blob/master/doc/protected_api.md](https://github.com/tom-bjorkholm/table-io/blob/master/doc/protected_api.md)
 The protected API documentation is only for developers that want to
 extend the framework by adding their own classes as registered
 readers/writers to the factory.
@@ -109,9 +109,9 @@ a better start by reading the examples.
 
 ## Test summary
 
-- Test result: 1344 passed in 20s
+- Test result: 1347 passed in 20s
 - No flake8 warnings.
 - No mypy errors found.
 - No python layout warnings.
-- Built version(s): 0.9
-- Build and test using Python 3.14.4
+- Built version(s): 1.1
+- Build and test using Python 3.14.6

{tableio-0.9 → tableio-1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tableio"
-version = "0.9"
+version = "1.1"
 authors = [
   { name="Tom Björkholm", email="klausuler_linnet0q@icloud.com" },
 ]
@@ -15,9 +15,15 @@ license = "MIT"
 license-files = ["LICENSE.txt"]
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Operating System :: OS Independent"
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Operating System :: OS Independent",
+    "Intended Audience :: Developers",
+    "Typing :: Typed"
 ]
 dynamic = ["dependencies"]
 
 [project.urls]
-"Source code" = "https://bitbucket.org/tom-bjorkholm/table-io"
+"Source code" = "https://github.com/tom-bjorkholm/table-io"
+"Documentation" = "https://github.com/tom-bjorkholm/table-io/blob/master/doc/"

{tableio-0.9 → tableio-1.1}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
   name='tableio',
-  version='0.9',
+  version='1.1',
   description='Uniform way to write table data to and read from different ' \
     'file formats',
   author='Tom Björkholm',
@@ -14,15 +14,11 @@ setup(
   packages=['tableio'],
   package_dir={'tableio': 'src/tableio'},
   package_data={'tableio': ['src/py.typed']},
-  install_requires=[  # pylint: disable=duplicate-code
-    'pip >= 26.1.1',
-    'setuptools >= 82.0.1',
-    'build >= 1.5.0',
-    'wheel >= 0.47.0',
-    'mformat-ext >= 0.6',
+  install_requires=[
+    'mformat-ext >= 0.7',
     'openpyxl >= 3.1.5',
-    'types-openpyxl >= 3.1.5.20260402',
-    'odfdo >= 3.22.7',
+    'types-openpyxl >= 3.1.5.20260518',
+    'odfdo >= 3.22.10',
     'xlsxwriter >= 3.2.9',
     'pylightxl >= 1.61'
   ]

{tableio-0.9 → tableio-1.1}/src/tableio/tableio_spreadsheetbased.py

@@ -50,6 +50,16 @@ class _ScanResult(NamedTuple):
     next_read_row: int
 
 
+class _ReadLimits(NamedTuple):
+    """Resolved row and column limits for one section read."""
+
+    left: int
+    top: int
+    bottom: int
+    scan_right: int
+    fixed_right: Optional[int]
+
+
 class _SheetState(NamedTuple):
     """Sequential state tracked for one sheet during an open session."""
 
@@ -295,8 +305,7 @@ class TableIOSpreadsheetBased(TableIO):
                 if read_sheet is not write_sheet:
                     self._write_value_to_sheet(read_sheet, row, column, None)
 
-    def _read_limits(
-            self, box: Optional[Box]) -> tuple[int, int, int, Optional[int]]:
+    def _read_limits(self, box: Optional[Box]) -> _ReadLimits:
         """Return the row and column limits for a read operation."""
         read_sheet = self._read_sheet()
         left = 0 if box is None else box.left
@@ -304,8 +313,10 @@ class TableIOSpreadsheetBased(TableIO):
         bottom = box.bottom if box is not None and \
             box.bottom is not None else self._scan_limit_bottom(read_sheet,
                                                                 top)
-        right = box.right if box is not None else None
-        return left, top, bottom, right
+        fixed_right = box.right if box is not None else None
+        scan_right = self._scan_limit_right(read_sheet, left, fixed_right)
+        return _ReadLimits(left=left, top=top, bottom=bottom,
+                           scan_right=scan_right, fixed_right=fixed_right)
 
     def _scan_limit_bottom(self, sheet: object, top: int) -> int:
         """Return the exclusive bottom limit used when scanning rows."""
@@ -353,20 +364,26 @@ class TableIOSpreadsheetBased(TableIO):
     def _scan_section(self, box: Optional[Box]) -> _ScanResult:
         """Scan the next readable section on the active sheet."""
         sheet = self._read_sheet()
-        left, top, bottom, right = self._read_limits(box)
-        row = top
-        last_read_row = top - 1
-        while row < bottom and self._row_is_empty(sheet, row, left, right):
+        limits = self._read_limits(box)
+        left = limits.left
+        bottom = limits.bottom
+        scan_right = limits.scan_right
+        fixed_right = limits.fixed_right
+        row = limits.top
+        last_read_row = limits.top - 1
+        while row < bottom and self._row_is_empty(sheet, row, left,
+                                                  scan_right):
             last_read_row = row
             row += 1
         headings: list[str] = []
-        while row < bottom and self._row_is_heading(sheet, row, left, right,
-                                                    bottom):
-            heading = self._cell_value(sheet, row, left)
-            headings.append(value_to_str(heading, none_is_empty=True))
+        while row < bottom and self._row_is_heading(sheet, row, left,
+                                                    scan_right, bottom):
+            headings.append(value_to_str(self._cell_value(sheet, row, left),
+                                         none_is_empty=True))
             last_read_row = row
             row += 1
-            while row < bottom and self._row_is_empty(sheet, row, left, right):
+            while row < bottom and self._row_is_empty(sheet, row, left,
+                                                      scan_right):
                 last_read_row = row
                 row += 1
         table_top = row
@@ -374,17 +391,17 @@ class TableIOSpreadsheetBased(TableIO):
         table_right = left
         while row < bottom:
             nonempty_columns = self._row_nonempty_columns(sheet, row, left,
-                                                          right)
+                                                          scan_right)
             if not nonempty_columns:
                 last_read_row = row
                 row += 1
                 break
             last_read_row = row
             table_bottom = row + 1
-            if right is None:
+            if fixed_right is None:
                 table_right = max(table_right, max(nonempty_columns) + 1)
             else:
-                table_right = right
+                table_right = fixed_right
             row += 1
         return _ScanResult(headings=headings, table_top=table_top,
                            table_bottom=table_bottom, table_left=left,

{tableio-0.9 → tableio-1.1/tableio.egg-info}/PKG-INFO

@@ -1,24 +1,26 @@
 Metadata-Version: 2.4
 Name: tableio
-Version: 0.9
+Version: 1.1
 Summary: Uniform way to write table data to and read from different file formats
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
 License-Expression: MIT
-Project-URL: Source code, https://bitbucket.org/tom-bjorkholm/table-io
+Project-URL: Source code, https://github.com/tom-bjorkholm/table-io
+Project-URL: Documentation, https://github.com/tom-bjorkholm/table-io/blob/master/doc/
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
+Classifier: Intended Audience :: Developers
+Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pip>=26.1.1
-Requires-Dist: setuptools>=82.0.1
-Requires-Dist: build>=1.5.0
-Requires-Dist: wheel>=0.47.0
-Requires-Dist: mformat-ext>=0.6
+Requires-Dist: mformat-ext>=0.7
 Requires-Dist: openpyxl>=3.1.5
-Requires-Dist: types-openpyxl>=3.1.5.20260402
-Requires-Dist: odfdo>=3.22.7
+Requires-Dist: types-openpyxl>=3.1.5.20260518
+Requires-Dist: odfdo>=3.22.10
 Requires-Dist: xlsxwriter>=3.2.9
 Requires-Dist: pylightxl>=1.61
 Dynamic: author
@@ -121,13 +123,13 @@ The main features are:
 
 The best way to learn to use this package is to use the provided
 example programs:
-[https://bitbucket.org/tom-bjorkholm/table-io/src/master/example/src/example/README.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/example/src/example/README.md).
+[https://github.com/tom-bjorkholm/table-io/blob/master/example/src/example/README.md](https://github.com/tom-bjorkholm/table-io/blob/master/example/src/example/README.md).
 
 ## API documentation
 
-You can find the public API documentation at [https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/api.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/api.md)
+You can find the public API documentation at [https://github.com/tom-bjorkholm/table-io/blob/master/doc/api.md](https://github.com/tom-bjorkholm/table-io/blob/master/doc/api.md)
 
-You can find the protected API documentation at [https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/protected_api.md](https://bitbucket.org/tom-bjorkholm/table-io/src/master/doc/protected_api.md)
+You can find the protected API documentation at [https://github.com/tom-bjorkholm/table-io/blob/master/doc/protected_api.md](https://github.com/tom-bjorkholm/table-io/blob/master/doc/protected_api.md)
 The protected API documentation is only for developers that want to
 extend the framework by adding their own classes as registered
 readers/writers to the factory.
@@ -137,9 +139,9 @@ a better start by reading the examples.
 
 ## Test summary
 
-- Test result: 1344 passed in 20s
+- Test result: 1347 passed in 20s
 - No flake8 warnings.
 - No mypy errors found.
 - No python layout warnings.
-- Built version(s): 0.9
-- Build and test using Python 3.14.4
+- Built version(s): 1.1
+- Build and test using Python 3.14.6

tableio-1.1/tableio.egg-info/requires.txt

@@ -0,0 +1,6 @@
+mformat-ext>=0.7
+openpyxl>=3.1.5
+types-openpyxl>=3.1.5.20260518
+odfdo>=3.22.10
+xlsxwriter>=3.2.9
+pylightxl>=1.61

tableio-0.9/tableio.egg-info/requires.txt

@@ -1,10 +0,0 @@
-pip>=26.1.1
-setuptools>=82.0.1
-build>=1.5.0
-wheel>=0.47.0
-mformat-ext>=0.6
-openpyxl>=3.1.5
-types-openpyxl>=3.1.5.20260402
-odfdo>=3.22.7
-xlsxwriter>=3.2.9
-pylightxl>=1.61