mergeron 2025.739439.12__tar.gz → 2025.739596.4__tar.gz

{mergeron-2025.739439.12 → mergeron-2025.739596.4}/PKG-INFO

@@ -1,26 +1,30 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: mergeron
-Version: 2025.739439.12
+Version: 2025.739596.4
 Summary: Python for analyzing merger enforcement policy
-License: MIT
+License-Expression: MIT
+License-File: docs/source/license.rst
 Keywords: merger enforcement policy,merger guidelines,merger screening,enforcement presumptions,concentration standards,diversion ratio,upward pricing pressure,GUPPI
 Author: Murthy Kambhampaty
 Author-email: smk@capeconomics.com
-Requires-Python: >=3.13,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: aenum (>=3.1.16)
 Requires-Dist: attrs (>=25.3.0)
+Requires-Dist: backports.zstd ; python_version < "3.14"
 Requires-Dist: beautifulsoup4 (>=4.13.4)
 Requires-Dist: certifi (>=2025.6.15)
 Requires-Dist: h5py (>=3.14.0)
+Requires-Dist: hdf5plugin (>=6.0.0,<7.0.0)
 Requires-Dist: jinja2 (>=3.1.6)
 Requires-Dist: joblib (>=1.5.1)
 Requires-Dist: lxml (>=6.0.0)

mergeron-2025.739596.4/docs/source/license.rst

@@ -0,0 +1,13 @@
+License
+========
+
+Copyright 2017-2025 S. Murthy Kambhampaty
+
+MIT License
+-----------
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

{mergeron-2025.739439.12 → mergeron-2025.739596.4}/pyproject.toml

@@ -15,8 +15,8 @@ keywords = [
     "upward pricing pressure",
     "GUPPI",
 ]
-version = "2025.739439.12"
-requires-python = ">=3.13,<4.0" # need math.fma
+version = "2025.739596.4"
+requires-python = ">=3.12,<4.0"
 
 # Classifiers list: https://pypi.org/classifiers/
 classifiers = [
@@ -24,16 +24,18 @@ classifiers = [
     "Environment :: Console",
     "Intended Audience :: End Users/Desktop",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 
 dependencies = [
     "aenum>=3.1.16",
     "attrs>=25.3.0",
+    "backports.zstd; python_version < '3.14'",
     "beautifulsoup4>=4.13.4",
     "certifi>=2025.6.15",
     "h5py>=3.14.0",
@@ -48,6 +50,7 @@ dependencies = [
     "sympy>=1.14.0",
     "types-beautifulsoup4>=4.12.0.20250516",
     "urllib3>=2.5.0",
+    "hdf5plugin (>=6.0.0,<7.0.0)",
 ]
 
 [project.urls]
@@ -55,36 +58,36 @@ Homepage = "https://software.capeconomics.com/mergeron/"
 Repository = "https://github.com/capeconomics/mergeron.git"
 
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.group.doc.dependencies]
-sphinx = ">=8.2.3"
-sphinx-autoapi = ">=3.6.0"
-sphinx-autodoc-typehints = ">=3.2.0"
-sphinx-immaterial = ">=0.13.5"
-linuxdoc = ">=20240924"
-ipython = ">=9.4.0"
-ipython-pygments-lexers = ">=1.1.1"
-
-[tool.poetry.group.lint.dependencies]
-ruff = ">=0.12.2"
-mypy = ">=1.16.1"
-
-[tool.poetry.group.test.dependencies]
-coverage = ">=7.9.2"
-pytest = ">=8.4.1"
-pytest-cov = ">=6.2.1"
-pytest-xdist = ">=3.8.0"
-pytest-sugar = "^1.1.1"
-tox = "^4.30.2"
-
-[tool.poetry.group.other.dependencies]
-semver = ">=3.0.4"
-twine = ">=6.1.0"
-pendulum = ">=3.1.0"
-poetry = ">=2.1.3"
+[dependency-groups]
+doc = [
+    "sphinx<9",
+    "sphinx-autodoc-typehints",
+    "sphinx-autoapi",
+    "sphinx-immaterial",
+    "linuxdoc",
+    "ipython",
+    "ipython-pygments-lexers",
+    "roman_numerals",
+]
+lint = [
+    "ruff",
+    "mypy",
+    "radon",
+    "xenon"
+]
+test = [
+    "coverage",
+    "pendulum",
+    "pytest",
+    "pytest-cov",
+    "pytest-xdist",
+    "pytest-sugar",
+    "tox"
+]
+dev = [
+    "semver",
+    "twine",
+]
 
 [tool.ruff]
 
@@ -187,9 +190,14 @@ preview = true
 
 [tool.mypy]
 
+fixed_format_cache = true
 cache_fine_grained = true
 ignore_missing_imports = false
+warn_unreachable = false
+warn_redundant_casts = true
 strict = true
+strict_equality = true
+strict_equality_for_none = true
 local_partial_types = true
 allow_redefinition_new = true
 enable_incomplete_feature = ["PreciseTupleTypes"]
@@ -203,14 +211,17 @@ no_implicit_reexport = true
 
 allow_redefinition = true
 
-[tool.pytest.ini_options]
-log_auto_indent = 4
-minversion = "8.0"
+[tool.pytest]
+log_auto_indent = "4"
+minversion = "9.0"
 addopts = [
     "--import-mode=importlib",
     "--cov=mergeron",
     "--cov-report=html:tests/cov_html",
 ]
+testpaths = [
+    "tests",
+]
 filterwarnings = [
     "all",
     "ignore::DeprecationWarning:dateutil.tz.tz",
@@ -225,31 +236,43 @@ tmp_path_retention_policy = "failed"
 
 [tool.tox]
 requires = ["tox>=4.19"]
+skip_missing_interpreters = true
 isolated_build = true
-envlist = ["py313"]
 
-
-[tool.tox.env."py313"]
+[tool.tox.env_run_base]
 commands = [
     [
-        "poetry",
-        "config",
-        "virtualenvs.create",
-        "false",
+        "uv",
+        "sync",
+        "--active",
+        "--group",
+        "lint",
+        "--group",
+        "test",
+    ],
+    [
+        "ruff",
+        "check",
+        "./src",
     ],
     [
-        "poetry",
-        "install",
-        "--without",
-        "doc,lint",
-        "--no-root",
+        "mypy",
+        "./src",
     ],
     [
         "pytest",
-        "--force-sugar",
         { replace = "posargs", extend = true },
     ],
 ]
 
-description = "install pytest in a virtual environment and invoke it on the tests folder"
-deps = ["poetry"]
+description = "install ruff, mpypy, pytest in a virtual environment and invoke each, in turn"
+deps = ["poetry-core"]
+allowlist_externals = ["uv"] 
+
+[tool.uv]
+default-groups = ["dev",]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+

{mergeron-2025.739439.12 → mergeron-2025.739596.4}/src/mergeron/__init__.py

@@ -15,7 +15,7 @@ from ruamel import yaml
 
 _PKG_NAME: str = Path(__file__).parent.name
 
-VERSION = "2025.739439.12"
+VERSION = "2025.739504.0"
 
 __version__ = VERSION
 
@@ -41,7 +41,7 @@ PKG_ATTRS_MAP: dict[str, type] = {}
 
 np.set_printoptions(precision=28, floatmode="fixed", legacy=False)
 
-type HMGPubYear = Literal[1992, 2010, 2023]
+type PubYear = Literal[1992, 2010, 2023]
 
 type ArrayBoolean = NDArray[np.bool_]
 type ArrayFloat = NDArray[np.floating]
@@ -50,6 +50,8 @@ type ArrayINT = NDArray[np.integer]
 type ArrayDouble = NDArray[np.float64]
 type ArrayBIGINT = NDArray[np.int64]
 
+# redefine numpy testing functions to modify default tolerances
+
 
 def allclose(
     _a: ArrayFloat | ArrayINT | float | int,
@@ -80,8 +82,8 @@ def assert_allclose(  # noqa: PLR0913
     return np.testing.assert_allclose(
         _a,
         _b,
-        atol=1e-15,
-        rtol=1e-14,
+        atol=atol,
+        rtol=rtol,
         equal_nan=equal_nan,
         err_msg=err_msg,
         verbose=verbose,
@@ -89,6 +91,9 @@ def assert_allclose(  # noqa: PLR0913
     )
 
 
+# Add functions for serializing/deserializing some objects used
+# or defined in this package
+
 this_yaml = yaml.YAML(typ="rt")
 this_yaml.indent(mapping=2, sequence=4, offset=2)
 
@@ -164,7 +169,7 @@ class Enameled(enum.Enum):
     def from_yaml(
         cls, _c: yaml.constructor.RoundTripConstructor, _n: yaml.ScalarNode
     ) -> enum.EnumType:
-        """Deserialize enumeration."""
+        """Deserialize enumeration serialized by .name."""
         retval: enum.EnumType = super().__getattribute__(cls, _n.value)
         return retval
 

{mergeron-2025.739439.12 → mergeron-2025.739596.4}/src/mergeron/core/__init__.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import shutil
 from collections.abc import Mapping
 from decimal import Decimal
 from types import MappingProxyType
@@ -20,6 +21,8 @@ from .. import (  # noqa: TID252
     yamelize_attrs,
     yaml_rt_mapper,
 )
+from .. import WORK_DIR as PKG_WORK_DIR  # noqa: TID252
+from .. import data as mdat  # noqa: TID252
 
 __version__ = VERSION
 
@@ -40,6 +43,70 @@ class GuidelinesBoundary:
     """Area under the boundary."""
 
 
+WORK_DIR = globals().get("WORK_DIR", PKG_WORK_DIR)
+"""Redefined, in case the user defines WORK_DIR between module imports."""
+
+FID_WORK_DIR = WORK_DIR / "FTCData"
+if not FID_WORK_DIR.is_dir():
+    FID_WORK_DIR.mkdir(parents=True)
+
+INVDATA_ARCHIVE_PATH = WORK_DIR / mdat.FTC_MERGER_INVESTIGATIONS_DATA.name
+if not INVDATA_ARCHIVE_PATH.is_file():
+    shutil.copy2(mdat.FTC_MERGER_INVESTIGATIONS_DATA, INVDATA_ARCHIVE_PATH)  # type: ignore
+
+TABLE_TYPES = ("ByHHIandDelta", "ByFirmCount")
+CONC_TABLE_ALL = "Table 3.1"
+CNT_TABLE_ALL = "Table 4.1"
+
+TTL_KEY = 86825
+CONC_HHI_DICT = {
+    "0 - 1,799": 0,
+    "1,800 - 1,999": 1800,
+    "2,000 - 2,399": 2000,
+    "2,400 - 2,999": 2400,
+    "3,000 - 3,999": 3000,
+    "4,000 - 4,999": 4000,
+    "5,000 - 6,999": 5000,
+    "7,000 - 10,000": 7000,
+    "TOTAL": TTL_KEY,
+}
+CONC_DELTA_DICT = {
+    "0 - 100": 0,
+    "100 - 200": 100,
+    "200 - 300": 200,
+    "300 - 500": 300,
+    "500 - 800": 500,
+    "800 - 1,200": 800,
+    "1,200 - 2,500": 1200,
+    "2,500 - 5,000": 2500,
+    "TOTAL": TTL_KEY,
+}
+CNT_FCOUNT_DICT = {
+    "2 to 1": 2,
+    "3 to 2": 3,
+    "4 to 3": 4,
+    "5 to 4": 5,
+    "6 to 5": 6,
+    "7 to 6": 7,
+    "8 to 7": 8,
+    "9 to 8": 9,
+    "10 to 9": 10,
+    "10 +": 11,
+    "TOTAL": TTL_KEY,
+}
+
+
+def invert_map(_dict: Mapping[Any, Any]) -> Mapping[Any, Any]:
+    """Invert mapping, mapping values to keys of the original mapping."""
+    return {_v: _k for _k, _v in _dict.items()}
+
+
+type INVData = MappingProxyType[
+    str, MappingProxyType[str, MappingProxyType[str, INVTableData]]
+]
+type INVData_in = dict[str, dict[str, dict[str, INVTableData]]]
+
+
 @frozen
 class INVTableData:
     """Represents individual table of FTC merger investigations data."""
@@ -49,11 +116,6 @@ class INVTableData:
     data_array: ArrayBIGINT = field(eq=cmp_using(eq=np.array_equal))
 
 
-type INVData = MappingProxyType[
-    str, MappingProxyType[str, MappingProxyType[str, INVTableData]]
-]
-type INVData_in = dict[str, dict[str, dict[str, INVTableData]]]
-
 yamelize_attrs(INVTableData)
 
 (_, _) = (