mergeron 2025.739355.19__tar.gz → 2025.739413.1__tar.gz

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mergeron
-Version: 2025.739355.19
+Version: 2025.739413.1
 Summary: Python for analyzing merger enforcement policy
 License: MIT
 Keywords: merger enforcement policy,merger guidelines,merger screening,enforcement presumptions,concentration standards,diversion ratio,upward pricing pressure,GUPPI

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/pyproject.toml

@@ -15,7 +15,7 @@ keywords = [
     "upward pricing pressure",
     "GUPPI",
 ]
-version = "2025.739355.19"
+version = "2025.739413.1"
 requires-python = ">=3.12,<4.0"
 
 # Classifiers list: https://pypi.org/classifiers/
@@ -189,6 +189,8 @@ preview = true
 cache_fine_grained = true
 ignore_missing_imports = false
 strict = true
+local_partial_types = true
+allow_redefinition_new = true
 enable_incomplete_feature = ["PreciseTupleTypes"]
 
 show_column_numbers = true
@@ -200,8 +202,6 @@ no_implicit_reexport = true
 
 allow_redefinition = true
 
-plugins = "numpy.typing.mypy_plugin"
-
 [tool.pytest.ini_options]
 log_auto_indent = 4
 minversion = "8.0"

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/__init__.py

@@ -15,7 +15,7 @@ from ruamel import yaml
 
 _PKG_NAME: str = Path(__file__).parent.name
 
-VERSION = "2025.739355.19"
+VERSION = "2025.739413.1"
 
 __version__ = VERSION
 
@@ -51,6 +51,44 @@ type ArrayDouble = NDArray[np.float64]
 type ArrayBIGINT = NDArray[np.int64]
 
 
+def allclose(
+    _a: ArrayFloat | ArrayINT | float | int,
+    _b: ArrayFloat | ArrayINT | float | int,
+    /,
+    *,
+    rtol: float = 1e-14,
+    atol: float = 1e-15,
+    equal_nan: bool = True,
+) -> bool:
+    """Redefine native numpy function with updated default tolerances."""
+    return np.allclose(_a, _b, atol=atol, rtol=rtol, equal_nan=equal_nan)
+
+
+def assert_allclose(  # noqa: PLR0913
+    _a: ArrayFloat | ArrayINT | float | int,
+    _b: ArrayFloat | ArrayINT | float | int,
+    /,
+    *,
+    rtol: float = 1e-14,
+    atol: float = 1e-15,
+    equal_nan: bool = True,
+    err_msg: str = "",
+    verbose: bool = False,
+    strict: bool = True,
+) -> None:
+    """Redefine native numpy function with updated default tolerances, type-enforcing."""
+    return np.testing.assert_allclose(
+        _a,
+        _b,
+        atol=1e-15,
+        rtol=1e-14,
+        equal_nan=equal_nan,
+        err_msg=err_msg,
+        verbose=verbose,
+        strict=True,
+    )
+
+
 this_yaml = yaml.YAML(typ="rt")
 this_yaml.indent(mapping=2, sequence=4, offset=2)
 

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/core/empirical_margin_distribution.py

@@ -221,22 +221,23 @@ def margin_data_getter(
     elif data_download_flag or not list(data_archive_path.glob("margin*.xls")):
         margin_data_downloader()
 
-    # Whitespace cleanup
-    ws_pat = re.compile(r"\s+")
-
     #  Parse workbooks and save margin data dictionary
     margin_data_: dict[str, dict[str, MappingProxyType[str, float]]] = {}
     for _p in (WORK_DIR / "damodaran_margin_data_archive").iterdir():
         xl_wbk = CalamineWorkbook.from_path(_p)
         xl_wks = xl_wbk.get_sheet_by_index(
-            0 if (_p.stem != "margin" and int(_p.stem[-2:]) in {17, 18, 19}) else 1
+            0
+            if (_p.stem.startswith("margin") and _p.stem[-2:] in {"17", "18", "19"})
+            else 1
         ).to_python()
         if xl_wks[8][2] != "Gross Margin":
             raise ValueError("Worksheet does not match expected layout.")
         row_keys: list[str] = [_c.upper() for _c in xl_wks[8][1:]]  # type: ignore
 
         _u = xl_wks[0][1]
-        if not isinstance(_u, datetime.datetime):
+        if not isinstance(_u, datetime.date):
+            print(_u)
+            print(xl_wks[:8])
             raise ValueError("Worksheet does not match expected layout.")
         update: str = _u.isoformat()[:10]
 

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/core/ftc_merger_investigations_data.py

@@ -434,7 +434,7 @@ def _parse_invdata() -> INVData:
         " the source code as well as to install an additional package"
         " not distributed with this package or identified as a requirement."
     )
-    import pymupdf  # type: ignore  # noqa: PLC0415
+    import pymupdf  # type: ignore
 
     invdata_docnames = _download_invdata(FID_WORK_DIR)
 
@@ -656,9 +656,10 @@ def _process_table_blks_conc_type(
     # Check column totals
     for _col_tot in col_totals:
         assert_array_equal(
-            _col_tot[2:],
+            _col_tot[2:],  # type: ignore
             np.einsum(
-                "ij->j", invdata_array[invdata_array[:, 1] == _col_tot[1]][:, 2:]
+                "ij->j",
+                invdata_array[invdata_array[:, 1] == _col_tot[1]][:, 2:],  # type: ignore
             ),
         )
 

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/core/guidelines_boundaries.py

@@ -327,23 +327,25 @@ class DiversionRatioBoundary:
         share_ratio = critical_share_ratio(
             self.diversion_ratio, r_bar=self.recapture_ratio
         )
-        upp_agg_kwargs: gbfn.ShareRatioBoundaryKeywords = {
-            "recapture_form": getattr(self.recapture_form, "value", "inside-out"),
-            "dps": self.precision,
-        }
+
+        upp_agg_kwargs: gbfn.ShareRatioBoundaryKeywords = {"dps": self.precision}
+        if self.agg_method != UPPAggrSelector.MAX:
+            upp_agg_kwargs |= {
+                "recapture_form": getattr(self.recapture_form, "value", "inside-out")
+            }
 
         match self.agg_method:
             case UPPAggrSelector.DIS:
                 upp_agg_fn = gbfn.diversion_share_boundary_wtd_avg
                 upp_agg_kwargs |= {"agg_method": "distance", "weighting": None}
             case UPPAggrSelector.AVG:
-                upp_agg_fn = gbfn.diversion_share_boundary_xact_avg  # type: ignore
+                upp_agg_fn = gbfn.diversion_share_boundary_xact_avg
             case UPPAggrSelector.MAX:
-                upp_agg_fn = gbfn.diversion_share_boundary_max  # type: ignore
-                upp_agg_kwargs = {"dps": 10}  # replace here
+                upp_agg_fn = gbfn.diversion_share_boundary_max
+                upp_agg_kwargs |= {"dps": 10}
             case UPPAggrSelector.MIN:
-                upp_agg_fn = gbfn.diversion_share_boundary_min  # type: ignore
-                upp_agg_kwargs |= {"dps": 10}  # update here
+                upp_agg_fn = gbfn.diversion_share_boundary_min
+                upp_agg_kwargs |= {"dps": 10}
             case _:
                 upp_agg_fn = gbfn.diversion_share_boundary_wtd_avg
 
@@ -365,7 +367,7 @@ class DiversionRatioBoundary:
 
                 upp_agg_kwargs |= {"agg_method": aggregator_, "weighting": wgt_type}
 
-        boundary_ = upp_agg_fn(share_ratio, self.recapture_ratio, **upp_agg_kwargs)
+        boundary_ = upp_agg_fn(share_ratio, self.recapture_ratio, **upp_agg_kwargs)  # type: ignore
         object.__setattr__(self, "area", boundary_.area)
         object.__setattr__(self, "coordinates", boundary_.coordinates)
 

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/core/guidelines_boundary_functions.py

@@ -481,7 +481,7 @@ def diversion_share_boundary_xact_avg(
     _bdry_start = np.array([(_s_mid, _s_mid)])
     _s_1 = np.arange(_s_mid - _step_size, 0, -_step_size)
     if recapture_form == "inside-out":
-        _s_intcpt: float = (
+        _s_intcpt = (
             2 * _delta_star * _r_val + 1 - np.abs(2 * _delta_star * _r_val - 1)
         ) / (2 * _r_val)
         nr_t1: ArrayDouble = (
@@ -523,11 +523,11 @@ def diversion_share_boundary_xact_avg(
                 f"with recapture spec, {f'"{recapture_form}"'} is incorrect."
             )
 
-        s_2: ArrayDouble = (nr_t1 - nr_t2_s1**0.5) / (2 * _r_val)
+        s_2 = (nr_t1 - nr_t2_s1**0.5) / (2 * _r_val)
 
     else:
-        _s_intcpt: float = _delta_star + 1 / 2 - np.abs(_delta_star - 1 / 2)
-        s_2: ArrayDouble = (
+        _s_intcpt = _delta_star + 1 / 2 - np.abs(_delta_star - 1 / 2)
+        s_2 = (
             0.5
             + _delta_star
             - _delta_star * _s_1

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/data/__init__.py

@@ -23,7 +23,7 @@ Use for replication/testing.
 NOTES
 -----
 Source data are from Prof. Aswath Damodaran, Stern School of Business, NYU; available online
-at https://pages.stern.nyu.edu/~adamodar/pc/datasets/margin.xls 
+at https://pages.stern.nyu.edu/~adamodar/pc/datasets/margin.xls
 and https://pages.stern.nyu.edu/~adamodar/pc/archives/margin*.xls.
 
 Gross margins are reported in 2017 data and later.

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/gen/__init__.py

@@ -25,6 +25,7 @@ from .. import (  # noqa: TID252
     Enameled,
     RECForm,
     UPPAggrSelector,
+    allclose,
     this_yaml,
     yamelize_attrs,
 )
@@ -350,7 +351,7 @@ class PCMSpec:
 
     dist_parms: ArrayFloat = field(
         kw_only=True,
-        eq=cmp_using(eq=np.array_equal),
+        eq=cmp_using(eq=allclose),
         converter=Converter(_pcm_dp_conv, takes_self=True),  # type: ignore
     )
     """Parameter specification for tailoring PCM distribution

{mergeron-2025.739355.19 → mergeron-2025.739413.1}/src/mergeron/gen/data_generation_functions.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Literal
 
-import numexpr as ne
+import numexpr as ne  # type: ignore
 import numpy as np
 from attrs import evolve
 from numpy.random import SeedSequence
@@ -386,7 +386,7 @@ def gen_market_shares_dirichlet(
     aggregate_purchase_prob_ = np.empty((_s_size, 1), float)
     aggregate_purchase_prob_.fill(np.nan)
     if _recapture_form == RECForm.OUTIN:
-        aggregate_purchase_prob_ = 1 - mktshr_array[:, [-1]]  # type: ignore
+        aggregate_purchase_prob_ = 1 - mktshr_array[:, [-1]]
         mktshr_array = mktshr_array[:, :-1] / aggregate_purchase_prob_
 
     return ShareSampleData(