mergeron 2024.739088.2__py3-none-any.whl → 2024.739089.1__py3-none-any.whl

mergeron/__init__.py

@@ -11,7 +11,7 @@ from numpy.typing import NDArray
 
 _PKG_NAME: str = Path(__file__).parent.stem
 
-VERSION = "2024.739088.2"
+VERSION = "2024.739089.1"
 
 __version__ = VERSION
 

mergeron/ext/xlsxw_helper.py

@@ -16,7 +16,7 @@ such as `polars` likely provide better performance.
 from __future__ import annotations
 
 from collections.abc import Mapping, Sequence
-from typing import Any, ClassVar
+from typing import Any, ClassVar, Literal, TypeAlias, TypedDict
 
 import numpy as np
 import numpy.typing as npt
@@ -29,6 +29,88 @@ __version__ = VERSION
 
 Workbook = xlsxwriter.Workbook
 
+xl_border_type: TypeAlias = Literal[
+    "none",
+    "thin",
+    "medium",
+    "dashed",
+    "dotted",
+    "thick",
+    "double",
+    "hair",
+    "medium_dashed",
+    "dash_dot",
+    "medium_dash_dot",
+    "dash_dot_dot",
+    "medium_dash_dot_dot",
+    "slant_dash_dot",
+    True,
+    False,
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+]
+
+
+class CFmtVal(TypedDict, total=False):
+    """Keys for xlsxwriter Format objects.
+
+    This is a partial list based on formats defined below.
+    """
+
+    font_name: str
+    font_size: int
+    font_color: str
+    bg_color: str  # html color string, no #
+    align: Literal[
+        "left", "center", "right", "center_across", "top", "bottom", "vcenter"
+    ]
+    text_wrap: bool
+    rotation: int  # integer, 0-360
+    indent: int
+    shrink: bool
+    bold: bool
+    italic: bool
+    underline: Literal[
+        True,
+        False,
+        1,
+        2,
+        33,
+        34,
+        "single",
+        "double",
+        "accountingSingle",
+        "accountingDouble",
+    ]
+    font_strikeout: bool
+    font_script: Literal[1, 2]
+
+    num_format: str
+
+    pattern: int
+
+    border: xl_border_type
+    bottom: xl_border_type
+    left: xl_border_type
+    right: xl_border_type
+    top: xl_border_type
+    bottom_color: str  # html color string, no #
+    left_color: str  # html color string, no #
+    right_color: str  # html color string, no #
+    top_color: str  # html color string, no #
+
 
 @unique
 class CFmt(dict, Enum):  # type: ignore
@@ -48,51 +130,51 @@ class CFmt(dict, Enum):  # type: ignore
 
     """
 
-    XL_DEFAULT: ClassVar = {"font_name": "Calibri", "font_size": 11}
-    XL_DEFAULT_2003: ClassVar = {"font_name": "Arial", "font_size": 10}
-
-    A_CTR: ClassVar = {"align": "center"}
-    A_CTR_ACROSS: ClassVar = {"align": "center_across"}
-    A_LEFT: ClassVar = {"align": "left"}
-    A_RIGHT: ClassVar = {"align": "right"}
-    V_TOP: ClassVar = {"align": "top"}
-    V_BOTTOM: ClassVar = {"align": "bottom"}
-    V_CTR: ClassVar = {"align": "vcenter"}
-
-    TEXT_WRAP: ClassVar = {"text_wrap": True}
-    TEXT_ROTATE: ClassVar = {"rotation": 90}
-    IND_1: ClassVar = {"indent": 1}
-
-    BOLD: ClassVar = {"bold": True}
-    BOLD_ITALIC: ClassVar = {"bold": True, "italic": True}
-    ITALIC: ClassVar = {"italic": True}
-    ULINE: ClassVar = {"underline": True}
-    SOUT: ClassVar = {"font_strikeout": True}
+    XL_DEFAULT: ClassVar[CFmtVal] = {"font_name": "Calibri", "font_size": 11}
+    XL_DEFAULT_2003: ClassVar[CFmtVal] = {"font_name": "Arial", "font_size": 10}
+
+    A_CTR: ClassVar[CFmtVal] = {"align": "center"}
+    A_CTR_ACROSS: ClassVar[CFmtVal] = {"align": "center_across"}
+    A_LEFT: ClassVar[CFmtVal] = {"align": "left"}
+    A_RIGHT: ClassVar[CFmtVal] = {"align": "right"}
+    V_TOP: ClassVar[CFmtVal] = {"align": "top"}
+    V_BOTTOM: ClassVar[CFmtVal] = {"align": "bottom"}
+    V_CTR: ClassVar[CFmtVal] = {"align": "vcenter"}
+
+    TEXT_WRAP: ClassVar[CFmtVal] = {"text_wrap": True}
+    TEXT_ROTATE: ClassVar[CFmtVal] = {"rotation": 90}
+    IND_1: ClassVar[CFmtVal] = {"indent": 1}
+
+    BOLD: ClassVar[CFmtVal] = {"bold": True}
+    BOLD_ITALIC: ClassVar[CFmtVal] = {"bold": True, "italic": True}
+    ITALIC: ClassVar[CFmtVal] = {"italic": True}
+    ULINE: ClassVar[CFmtVal] = {"underline": "single"}
+    SOUT: ClassVar[CFmtVal] = {"font_strikeout": True}
     # Useful with write_rich_text()
-    SUPERSCRIPT: ClassVar = {"font_script": 1}
-    SUBSCRIPT: ClassVar = {"font_script": 2}
-
-    AREA_NUM: ClassVar = ({"num_format": "0.00000000"},)
-    DOLLAR_NUM: ClassVar = {"num_format": "[$$-409]#,##0.00"}
-    DT_NUM: ClassVar = {"num_format": "mm/dd/yyyy"}
-    PCT_NUM: ClassVar = {"num_format": "##0%"}
-    PCT2_NUM: ClassVar = {"num_format": "##0.00%"}
-    PCT4_NUM: ClassVar = {"num_format": "##0.0000%"}
-    PCT6_NUM: ClassVar = {"num_format": "##0.000000%"}
-    PCT8_NUM: ClassVar = {"num_format": "##0.00000000%"}
-    QTY_NUM: ClassVar = {"num_format": "#,##0.0"}
-
-    BAR_FILL: ClassVar = {"pattern": 1, "bg_color": "dfeadf"}
-    HDR_FILL: ClassVar = {"pattern": 1, "bg_color": "bfbfbf"}
-
-    LEFT_BORDER: ClassVar = {"left": 1, "left_color": "000000"}
-    RIGHT_BORDER: ClassVar = {"right": 1, "right_color": "000000"}
-    BOT_BORDER: ClassVar = {"bottom": 1, "bottom_color": "000000"}
-    TOP_BORDER: ClassVar = {"top": 1, "top_color": "000000"}
-    HDR_BORDER: ClassVar = TOP_BORDER | BOT_BORDER
+    SUPERSCRIPT: ClassVar[CFmtVal] = {"font_script": 1}
+    SUBSCRIPT: ClassVar[CFmtVal] = {"font_script": 2}
+
+    AREA_NUM: ClassVar[CFmtVal] = {"num_format": "0.00000000"}
+    DOLLAR_NUM: ClassVar[CFmtVal] = {"num_format": "[$$-409]#,##0.00"}
+    DT_NUM: ClassVar[CFmtVal] = {"num_format": "mm/dd/yyyy"}
+    PCT_NUM: ClassVar[CFmtVal] = {"num_format": "##0%"}
+    PCT2_NUM: ClassVar[CFmtVal] = {"num_format": "##0.00%"}
+    PCT4_NUM: ClassVar[CFmtVal] = {"num_format": "##0.0000%"}
+    PCT6_NUM: ClassVar[CFmtVal] = {"num_format": "##0.000000%"}
+    PCT8_NUM: ClassVar[CFmtVal] = {"num_format": "##0.00000000%"}
+    QTY_NUM: ClassVar[CFmtVal] = {"num_format": "#,##0.0"}
+
+    BAR_FILL: ClassVar[CFmtVal] = {"pattern": 1, "bg_color": "dfeadf"}
+    HDR_FILL: ClassVar[CFmtVal] = {"pattern": 1, "bg_color": "bfbfbf"}
+
+    LEFT_BORDER: ClassVar[CFmtVal] = {"left": 1, "left_color": "000000"}
+    RIGHT_BORDER: ClassVar[CFmtVal] = {"right": 1, "right_color": "000000"}
+    BOT_BORDER: ClassVar[CFmtVal] = {"bottom": 1, "bottom_color": "000000"}
+    TOP_BORDER: ClassVar[CFmtVal] = {"top": 1, "top_color": "000000"}
+    HDR_BORDER: ClassVar[CFmtVal] = TOP_BORDER | BOT_BORDER
 
     @classmethod
-    def add_new(self, _fmt_name: str, _xlsx_fmt_dict: dict[str, Any], /) -> CFmt:
+    def add_new(self, _fmt_name: str, _xlsx_fmt_dict: CFmtVal, /) -> CFmt:
         """
         Add new CFmt object to instance.
 
@@ -297,6 +379,7 @@ def array_to_sheet(
     /,
     *,
     cell_format: Sequence[CFmt | Sequence[CFmt]] | CFmt | None = None,
+    empty_as_blank: bool = True,
     green_bar_flag: bool = True,
     ragged_flag: bool = True,
 ) -> tuple[int, int]:
@@ -390,7 +473,7 @@ def array_to_sheet(
     _right_column_id = _col_id + _num_cols
 
     if isinstance(cell_format, Sequence):
-        if ragged_flag:
+        if _num_rows > 1 and ragged_flag:
             raise ValueError(
                 "It is not clear whether the sequence of formats applies to all cells,"
                 " or to each cell respectively. Please provide a single-valued cell_format."
@@ -426,7 +509,14 @@ def array_to_sheet(
         _wbk_fmt_tuple = _wbk_formats_greened if _ri % 2 else _wbk_formats
         for _ci, _cv in enumerate(_rv):
             _cf = _wbk_fmt_tuple[_ci]
-            scalar_to_sheet(_xl_sheet, _row_id + _ri, _col_id + _ci, _cv, _cf)
+            scalar_to_sheet(
+                _xl_sheet,
+                _row_id + _ri,
+                _col_id + _ci,
+                _cv,
+                _cf,
+                empty_as_blank=empty_as_blank,
+            )
 
         _right_column_id = _col_id + _ci + 1 if _ci > _num_cols else _right_column_id
 

{mergeron-2024.739088.2.dist-info → mergeron-2024.739089.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.739088.2
+Version: 2024.739089.1
 Summary: Merger Policy Analysis using Python
 License: MIT
 Keywords: merger policy analysis,merger guidelines,merger screening,policy presumptions,concentration standards,upward pricing pressure,GUPPI

{mergeron-2024.739088.2.dist-info → mergeron-2024.739089.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mergeron/License.txt,sha256=7iX-y0EyjkbVJKJLS4ZKzuuE1wd0lryfsD_IytLG8lQ,1246
-mergeron/__init__.py,sha256=I-4UWXBTLSC71II8rxExM8CBFXj1jkjlJg7p9JCDMA4,1647
+mergeron/__init__.py,sha256=bE8NEQQkDJPIBNmC5bQ7BttUwIwvQOs_aCs8tALf62A,1647
 mergeron/core/__init__.py,sha256=KtjBlZOl7jwBCAUhrTJB9PdrN39YLYytNiSUSM_gRmA,62
 mergeron/core/damodaran_margin_data.py,sha256=pjI1rSK_O1-3Oel5b9KXH6ctnInjX1Vii7fypt00gV8,8541
 mergeron/core/ftc_merger_investigations_data.py,sha256=ZaV2DO7UZabV8eX0Ubq_ToIor7tIRzcvYC54ADliuTk,27931
@@ -23,7 +23,7 @@ mergeron/demo/__init__.py,sha256=KtjBlZOl7jwBCAUhrTJB9PdrN39YLYytNiSUSM_gRmA,62
 mergeron/demo/visualize_empirical_margin_distribution.py,sha256=v1xFJumBX2Ooye82kSSgly-_GpFVkYSDqBwM__rcmZY,2363
 mergeron/ext/__init__.py,sha256=KtjBlZOl7jwBCAUhrTJB9PdrN39YLYytNiSUSM_gRmA,62
 mergeron/ext/tol_colors.py,sha256=QBw8s-ZGpUpIIYOplHbLFZSXVoa6eDDJDtzSScP954E,22303
-mergeron/ext/xlsxw_helper.py,sha256=zCVWC7F5ZRNUCfSDwa3d8Evq7XXyoYZq4MZtU0lxJWM,15251
+mergeron/ext/xlsxw_helper.py,sha256=RMOdpLOCxxn7k92VxgHPY64o_UKY88ScvZhYxaIzBtk,17275
 mergeron/gen/__init__.py,sha256=mlZn8gud6bxP_XKSQY2c-u-C85A8U7VxUKLiXu2hMw0,16280
 mergeron/gen/_data_generation_functions.py,sha256=7fP4mSVaN36FBhPKSf1y_TbxfRUe-I7fgqdBt74oaCA,21029
 mergeron/gen/data_generation.py,sha256=gDvCZYJwGpQnokcygM7IRzHBpE5rYI2J5I8uu0_wQyE,8727
@@ -31,6 +31,6 @@ mergeron/gen/enforcement_stats.py,sha256=kpkpMbhqEGQcY2-oUYDj4N2MJ6tvBPSxVpPJne4
 mergeron/gen/market_sample.py,sha256=ekMA9db2AWvrA-GDbIieu270fovFX0JyynCo5FRAGzk,2270
 mergeron/gen/upp_tests.py,sha256=GQZcXU4vQPJRxdI2DVsY7yX6TPqhntlTH-DOAufWFmM,17197
 mergeron/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-mergeron-2024.739088.2.dist-info/METADATA,sha256=swh2YNR1_UNMzgIaz-iH5QlxbwKZzeTPayWExmczuXQ,8690
-mergeron-2024.739088.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mergeron-2024.739088.2.dist-info/RECORD,,
+mergeron-2024.739089.1.dist-info/METADATA,sha256=nzTy3ItwxFv3ZNefamgyZuxhXAVLOtlH9UYgmQYLogU,8690
+mergeron-2024.739089.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mergeron-2024.739089.1.dist-info/RECORD,,