mergeron_extra 2024.739148.5__tar.gz → 2024.739148.6__tar.gz

{mergeron_extra-2024.739148.5 → mergeron_extra-2024.739148.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron_extra
-Version: 2024.739148.5
+Version: 2024.739148.6
 Summary: Tools for users of the mergeron package.
 License: MIT
 Author: Murthy Kambhampaty
@@ -15,6 +15,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: aenum (>=3.1.15,<4.0.0)

{mergeron_extra-2024.739148.5 → mergeron_extra-2024.739148.6}/pyproject.toml

@@ -4,7 +4,7 @@ description = "Tools for users of the mergeron package."
 authors = ["Murthy Kambhampaty <smk@capeconomics.com>"]
 license = "MIT"
 readme = "README.rst"
-version = "2024.739148.5"
+version = "2024.739148.6"
 
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -147,7 +147,7 @@ preview = true
 python_version = "3.12"
 ignore_missing_imports = false
 strict = true
-enable_incomplete_feature = ["NewGenericSyntax", "PreciseTupleTypes"]
+enable_incomplete_feature = ["PreciseTupleTypes"]
 
 show_column_numbers = true
 show_error_codes = true

{mergeron_extra-2024.739148.5 → mergeron_extra-2024.739148.6}/src/mergeron_extra/__init__.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import numpy as np
 from numpy.typing import NDArray
 
-VERSION = "2024.739148.5"
+VERSION = "2024.739148.6"
 
 __version__ = VERSION
 

{mergeron_extra-2024.739148.5 → mergeron_extra-2024.739148.6}/src/mergeron_extra/xlsxw_helper.py

@@ -219,7 +219,7 @@ class CFmt(Enum):  # type: ignore
 
         """
 
-        return extend_enum(cls, _fmt_name, _xlsx_fmt_dict)  # type: ignore
+        return extend_enum(cls, _fmt_name, MappingProxyType(_xlsx_fmt_dict))  # type: ignore
 
     @classmethod
     def ensure_cell_format_spec_tuple(
@@ -492,7 +492,7 @@ def array_to_sheet(
             raise _err
     elif not (
         isinstance(_data_table, Sequence | np.ndarray)
-        and hasattr(_data_table[0], "__len__")
+        and isinstance(_data_table[0], Sequence | np.ndarray)
     ):
         raise ValueError("Given array must be two-dimensional array.")
 
@@ -553,9 +553,9 @@ def array_to_sheet(
 def scalar_to_sheet(
     _xl_book: Workbook,
     _xl_sheet: Worksheet,
-    _cell_addr_0: str | int = "A1",
     /,
-    *_s2s_args: Any,
+    *_s2s_args: tuple[str, Any, CFmt | Sequence[CFmt | Sequence[CFmt]] | None]
+    | tuple[int, int, Any, CFmt | Sequence[CFmt | Sequence[CFmt]] | None],
 ) -> None:
     """
     Write to a single cell in a worksheet.
@@ -594,21 +594,21 @@ def scalar_to_sheet(
 
     _cell_addr: tuple[str] | tuple[int, int]
     _cell_val: Any
-    _cell_fmt: CFmt | Sequence[CFmt] | None
+    _cell_fmt: CFmt | Sequence[CFmt | Sequence[CFmt]] | None
 
-    if isinstance(_cell_addr_0, str):
-        if len(_s2s_args) not in (1, 2):
+    if isinstance(_s2s_args[0], str):
+        if len(_s2s_args) not in (2, 3):
             raise ValueError("Incorrect number of arguments.")
-        _cell_addr = (_cell_addr_0,)
+        _cell_addr = (_s2s_args[0],)
         _cell_val = _s2s_args[0]
         _cell_fmt = _s2s_args[1] if len(_s2s_args) == 2 else None
-    elif isinstance(_cell_addr_0, int):
-        if len(_s2s_args) not in (2, 3) or not isinstance(_s2s_args[0], int):
+    elif isinstance(_s2s_args[0], int):
+        if not isinstance(_s2s_args[1], int) or len(_s2s_args) not in (3, 4):
             print(repr(_s2s_args))
             raise ValueError("Incorrect/incomplete specification for Excel cell data.")
-        _cell_addr = (_cell_addr_0, _s2s_args[0])
-        _cell_val = _s2s_args[1]
-        _cell_fmt = _s2s_args[2] if len(_s2s_args) == 3 else None
+        _cell_addr = _s2s_args[:2]
+        _cell_val = _s2s_args[2]
+        _cell_fmt = _s2s_args[3] if len(_s2s_args) == 3 else None
     else:
         raise ValueError("Incorrect/incomplete specification for Excel cell data.")
 
@@ -617,9 +617,7 @@ def scalar_to_sheet(
         if np.ndim(_cell_val) or _cell_val in (np.inf, -np.inf, np.nan)
         else (*_cell_addr, _cell_val)
     )
-    _write_args = (
-        (*_write_args, CFmt.xl_fmt(_xl_book, _cell_fmt)) if _cell_fmt else _write_args
-    )
+    _write_args += (CFmt.xl_fmt(_xl_book, _cell_fmt),) if _cell_fmt else ()
 
     if _cell_val is None or _cell_val == "":
         _xl_sheet.write_blank(*_write_args)