mergeron 2024.738888.21__tar.gz → 2024.738888.22__tar.gz

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.738888.21
+Version: 2024.738888.22
 Summary: Analysis of standards defined in Horizontal Merger Guidelines
 License: MIT
 Keywords: merger policy analysis,merger guidelines,merger screening,policy presumptions,concentration standards,upward pricing pressure,GUPPI
@@ -9,8 +9,6 @@ Author-email: smk@capeconomics.com
 Requires-Python: >=3.11,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Matplotlib
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
@@ -26,6 +24,7 @@ Requires-Dist: attrs (>=23.2,<24.0)
 Requires-Dist: bs4 (>=0.0.1,<0.0.2)
 Requires-Dist: certifi (>=2023.11.17,<2024.0.0)
 Requires-Dist: google-re2 (>=1.1,<2.0)
+Requires-Dist: importlib-metadata (>=7.0.1,<8.0.0)
 Requires-Dist: jinja2 (>=3.1,<4.0)
 Requires-Dist: joblib (>=1.3,<2.0)
 Requires-Dist: lxml (>=5.0,<6.0)
@@ -41,7 +40,6 @@ Requires-Dist: pymupdf (>=1.23,<2.0)
 Requires-Dist: requests (>=2.31,<3.0)
 Requires-Dist: requests-toolbelt (>=1.0.0,<2.0.0)
 Requires-Dist: scipy (>=1.12,<2.0)
-Requires-Dist: seaborn (>=0.13,<0.14)
 Requires-Dist: sympy (>=1.12,<2.0)
 Requires-Dist: tables (>=3.8,<4.0)
 Requires-Dist: xlrd (>=2.0,<3.0)

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "mergeron"
-# See get_version_str.py
-version = "2024.738888.21"
+# See ./get_version_str.py
+version = "2024.738888.22"
 description = "Analysis of standards defined in Horizontal Merger Guidelines"
 keywords = [
     "merger policy analysis",
@@ -20,8 +20,6 @@ readme = "README.md"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",
-    "Environment :: Web Environment",
-    "Framework :: Matplotlib",
     "Intended Audience :: End Users/Desktop",
     "Intended Audience :: Science/Research",
     "License :: OSI Approved :: MIT License",
@@ -35,7 +33,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 # You may need to apply the fixes in, https://github.com/python-poetry/poetry/issues/3365
-# if poetry takes forever to resolve dependencies (read the page at link to the end)
+# if poetry dependency resolution appears to hang (read the page at link to the end)
 aenum = "^3.1"
 attrs = "^23.2"
 bs4 = "^0.0.1"
@@ -55,13 +53,13 @@ pymupdf = "^1.23"
 python = "^3.11"
 requests = "^2.31"
 scipy = "^1.12"
-seaborn = "^0.13"
 sympy = "^1.12"
 tables = "^3.8"
 xlrd = "^2.0"
 xlsxwriter = "^3.1"
 certifi = "^2023.11.17"
 requests-toolbelt = "^1.0.0"
+importlib-metadata = "^7.0.1"
 
 
 [tool.poetry.group.dev.dependencies]
@@ -194,9 +192,11 @@ testpaths = ["tests"]
 addopts = ["--import-mode=importlib"]
 filterwarnings = [
     "all",
+    "ignore::DeprecationWarning:dateutil.tz.tz",
     "ignore::DeprecationWarning:jinja2.lexer",
+    "ignore::DeprecationWarning:joblib._utils",
     "ignore::DeprecationWarning:openpyxl.packaging.core",
-    "ignore::RuntimeWarning:mergeron.clrenf_stats_lib",
-    "ignore::RuntimeWarning:mergeron.core.propn_ci_lib",
+    "ignore::RuntimeWarning:mergeron.gen.investigations_stats",
+    "ignore::RuntimeWarning:mergeron.core.proportions_tests",
 ]
 tmp_path_retention_policy = "failed"

mergeron-2024.738888.21/src/mergeron/core/parse_damodaran_margin_data.py → mergeron-2024.738888.22/src/mergeron/core/damodaran_margin_data.py

@@ -43,7 +43,7 @@ from requests_toolbelt.downloadutils import stream
 from scipy import stats
 from xlrd import open_workbook
 
-from mergeron.core.gsf_lib import boundary_plot
+from mergeron.core.guidelines_standards import boundary_plot
 
 __version__ = metadata.version(Path(__file__).parents[1].stem)
 

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/clr_stats_obs_tables.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 from numpy import einsum, row_stack, unique
 
-import mergeron.core.parse_ftc_merger_investigations_data as fid
+import mergeron.core.ftc_merger_investigations_data as fid
 import mergeron.gen.investigations_stats as clstl
 
 data_path = Path.home() / Path(__file__).parents[1].stem

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/clr_stats_sim_tables.py

@@ -19,12 +19,12 @@ import tables as ptb  # type: ignore
 import mergeron.gen.data_generation as dgl
 import mergeron.gen.guidelines_tests as gsftl
 import mergeron.gen.investigations_stats as clstl
-from mergeron.core.gsf_lib import GuidelinesStandards
-from mergeron.core.parse_ftc_merger_investigations_data import (
+from mergeron.core.ftc_merger_investigations_data import (
     construct_invdata,
     invdata_dump_path,
 )
-from mergeron.core.propn_ci_lib import propn_ci
+from mergeron.core.guidelines_standards import GuidelinesStandards
+from mergeron.core.proportions_tests import propn_ci
 
 __version__ = metadata.version(Path(__file__).parents[1].stem)
 

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/concentration_as_diversion.py

@@ -33,8 +33,8 @@ from joblib import Parallel, cpu_count, delayed  # type: ignore
 from numpy import pi
 from xlsxwriter import Workbook  # type: ignore
 
-import mergeron.core.gsf_lib as gsf
-import mergeron.core.xlsxw_helper as xlh
+import mergeron.core.excel_helper as xlh
+import mergeron.core.guidelines_standards as gsf
 import mergeron.ext.tol_colors as ptcolor  # type: ignore
 
 mod_path = Path(__file__)

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/example_parameterizations.py

@@ -10,7 +10,7 @@ from typing import NamedTuple
 from numpy import column_stack, divide
 from numpy.typing import NDArray
 
-from mergeron.core.prng_cpu_multi import prng
+from mergeron.core.psuedorandom_numbers import prng
 from mergeron.gen.data_generation import (
     RECConstants,
     gen_market_shares_dirichlet,

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/guidelines_enforcement_patterns.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from numpy import array, column_stack
 
-import mergeron.core.propn_ci_lib as pcl
+import mergeron.core.proportions_tests as pcl
 
 enf_counts = array((
     (24, 25, 33, 33),

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/plotSafeHarbs_symbolically.py

@@ -1,7 +1,7 @@
 """
 
     Solve for, and plot, weighted-average GUPPI boundaries using sympy,
-    as a check against the numerical solutions in mergeron.core.gsf_lib
+    as a check against the numerical solutions in mergeron.core.guidelines_standards
 
 """
 

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/safeharbor_boundaries_for_mergers_with_asymmetric_shares.py

@@ -26,7 +26,7 @@ from numpy import (
     vstack,
 )
 
-import mergeron.core.gsf_lib as gsf
+import mergeron.core.guidelines_standards as gsf
 
 mod_path = Path(__file__)
 data_path = Path.home() / mod_path.parents[1].stem

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/safeharbor_boundaries_for_symmetric_firm_mergers.py

@@ -11,7 +11,7 @@ from matplotlib import cm as colormgr
 from matplotlib import colors as mcolors
 from matplotlib.ticker import AutoMinorLocator, MultipleLocator, StrMethodFormatter
 
-import mergeron.core.gsf_lib as gsf
+import mergeron.core.guidelines_standards as gsf
 
 prog_path = Path(__file__)
 data_path = Path.home() / prog_path.parents[1].stem

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/sound_guppi_safeharbor.py

@@ -8,7 +8,7 @@ from typing import Literal
 import numpy as np
 import tables as ptb  # type: ignore
 
-import mergeron.core.gsf_lib as gsf
+import mergeron.core.guidelines_standards as gsf
 import mergeron.gen.data_generation as dgl
 import mergeron.gen.guidelines_tests as gtl
 import mergeron.gen.investigations_stats as clstl

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/testSafeHarbs_comparative_aggregation.py

@@ -20,7 +20,7 @@ from matplotlib import colors as mcolors
 from matplotlib.ticker import MultipleLocator, StrMethodFormatter
 from numpy.typing import NDArray
 
-import mergeron.core.gsf_lib as gsf
+import mergeron.core.guidelines_standards as gsf
 import mergeron.gen.data_generation as dgl
 
 prog_path = Path(__file__)

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/testSafeHarbs_comparative_aggregation_MNL.py

@@ -18,7 +18,7 @@ from matplotlib import colors as mcolors
 from matplotlib.ticker import MultipleLocator, StrMethodFormatter
 from numpy.typing import NDArray
 
-import mergeron.core.gsf_lib as gsf
+import mergeron.core.guidelines_standards as gsf
 import mergeron.gen.data_generation as dgl
 
 prog_path = Path(__file__)

{mergeron-2024.738888.21 → mergeron-2024.738888.22}/src/mergeron/examples/testSafeHarbs_comparative_envelopes.py

@@ -23,10 +23,10 @@ from matplotlib.ticker import StrMethodFormatter
 from numpy import arange, argsort, column_stack, einsum, ones_like
 from numpy.typing import NDArray
 
-import mergeron.core.gsf_lib as gsf
+import mergeron.core.guidelines_standards as gsf
 import mergeron.gen.data_generation as dgl
 import mergeron.gen.investigations_stats as clstl
-from mergeron.core.prng_cpu_multi import DEFAULT_PARM_ARRAY
+from mergeron.core.psuedorandom_numbers import DEFAULT_PARM_ARRAY
 
 prog_path = Path(__file__)
 data_path = Path.home() / prog_path.parents[1].stem

mergeron-2024.738888.21/src/mergeron/gen/datagen_lib.py → mergeron-2024.738888.22/src/mergeron/gen/data_generation.py

@@ -13,8 +13,12 @@ import numpy as np
 from numpy.random import SeedSequence
 from numpy.typing import NDArray
 
-from mergeron.core.parse_damodaran_margin_data import resample_mgn_data
-from mergeron.core.prng_cpu_multi import DEFAULT_PARM_ARRAY, MultithreadedRNG, prng
+from mergeron.core.damodaran_margin_data import resample_mgn_data
+from mergeron.core.psuedorandom_numbers import (
+    DEFAULT_PARM_ARRAY,
+    MultithreadedRNG,
+    prng,
+)
 
 __version__ = metadata.version(Path(__file__).parents[1].stem)
 

mergeron-2024.738888.21/src/mergeron/gen/clrenf_stats_lib.py → mergeron-2024.738888.22/src/mergeron/gen/investigations_stats.py

@@ -18,9 +18,9 @@ from jinja2 import Environment, FileSystemLoader, Template, select_autoescape
 from numpy.typing import NDArray
 from scipy.interpolate import interp1d  # type: ignore
 
-import mergeron.core.parse_ftc_merger_investigations_data as fid
-from mergeron.core.parse_ftc_merger_investigations_data import TableData
-from mergeron.core.propn_ci_lib import propn_ci
+import mergeron.core.ftc_merger_investigations_data as fid
+from mergeron.core.ftc_merger_investigations_data import TableData
+from mergeron.core.proportions_tests import propn_ci
 
 m.patch()
 

mergeron-2024.738888.21/src/mergeron/core/parse_billmansalop_data.py

@@ -1,84 +0,0 @@
-import re
-from collections.abc import Mapping
-from importlib import metadata
-from pathlib import Path
-from types import MappingProxyType
-
-import fitz
-import msgpack
-
-__version__ = metadata.version(Path(__file__).parents[1].stem)
-
-
-data_dir = Path.home() / Path(__file__).parents[1].stem / "FTCData"
-if not data_dir.is_dir():
-    data_dir.mkdir(parents=True)
-invdata_dump_path = data_dir.parent / "billmansalop_data_tables.msgpack"
-
-table_no_re = re.compile(r"Table A(\d)\. .*")
-
-_invdata_path = Path(
-    R"M:\SMK-PersonalFolders\AuthorshipProjects",
-    R"GUPPISafeHarborTAB\LiteratureCited",
-    R"BillmanSalop_2022_MergerEnforcementStatistics_2001_2020_SSRN-id4274304.pdf",
-)
-
-
-def parse_invdata(_invdata_pdf_path: Path) -> Mapping:
-    _invdata_fitz = fitz.open(_invdata_pdf_path)
-
-    _data_period = "".join("2001-2020")
-
-    _table_data_dict = {}
-    _pgdata_list = []
-    for _invdata_pageno in range(28, 45):
-        _invdata_page = _invdata_fitz[_invdata_pageno]
-        _pgdata_row = ""
-        for _pgblk in _invdata_page.get_text("blocks", sort=False):
-            _pgdata = ", ".join(_f.strip() for _f in _pgblk[-3].strip().split("\n"))
-
-            if _pgdata.startswith("Table A"):
-                _tblno = _pgdata.split(".")[0]
-                _table_data_dict |= {_tblno: []}
-                _pgdata_list = _table_data_dict[_tblno]
-            elif (
-                _pgdata.startswith((
-                    "Electronic copy available at:",
-                    "<image:",
-                    "Parties, Agency",
-                ))
-                or re.match(
-                    r"(Filed|Resolved|Settled), (Resolved, )?Consummated", _pgdata
-                )
-                or re.match(r"Complaint|Outcome|Filed", _pgdata)
-                or re.match(r"\d+|, +|^$", _pgdata)
-                or hasattr(_pgdata, "image")
-            ):
-                continue
-            elif not re.search(r"DOJ|FTC", _pgdata):
-                _pgdata_row = "{}, ".format(
-                    " ".join(
-                        _f.strip() for _f in _pgdata.rsplit(",", maxsplit=1)
-                    ).strip()
-                )
-                if _pgdata_row.startswith("H.J. Heinz"):
-                    _pgdata_row = _pgdata_row.replace(R"Beech- Nut", "Beech-Nut")
-            else:
-                _pgdata_row += _pgdata  # .replace(R"Beech-\nNut", "Beech-Nut")
-                _pgdata_list += [_pgdata_row]
-                _pgdata_row = ""
-
-    _table_data_dict = MappingProxyType(_table_data_dict)
-    _ = invdata_dump_path.write_bytes(msgpack.packb(_table_data_dict))
-
-    return _table_data_dict
-
-
-if __name__ == "__main__":
-    table_data_dict = parse_invdata(_invdata_path)
-    for tblno in table_data_dict:
-        print(tblno, len(table_data_dict[tblno]), sep=", ")
-        for tblrow in table_data_dict[tblno]:
-            print(tblrow)
-        print()
-        print()