mergeron 2024.739123.8__tar.gz → 2024.739125.0__tar.gz

{mergeron-2024.739123.8 → mergeron-2024.739125.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.739123.8
+Version: 2024.739125.0
 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.739123.8 → mergeron-2024.739125.0}/pyproject.toml

@@ -13,7 +13,7 @@ keywords = [
     "upward pricing pressure",
     "GUPPI",
 ]
-version = "2024.739123.8"
+version = "2024.739125.0"
 
 # Classifiers list: https://pypi.org/classifiers/
 classifiers = [

{mergeron-2024.739123.8 → mergeron-2024.739125.0}/src/mergeron/__init__.py

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

{mergeron-2024.739123.8 → mergeron-2024.739125.0}/src/mergeron/core/ftc_merger_investigations_data.py

@@ -95,7 +95,7 @@ class INVTableData(NamedTuple):
     data_array: ArrayBIGINT
 
 
-INVData: TypeAlias = Mapping[str, dict[str, dict[str, INVTableData]]]
+INVData: TypeAlias = Mapping[str, Mapping[str, Mapping[str, INVTableData]]]
 
 
 def construct_data(
@@ -228,7 +228,7 @@ def _construct_no_evidence_data(_invdata: INVData, _data_period: str, /) -> None
             _invdata_sub_evid_cond_conc = _invdata[_data_period][_stats_grp]
 
             _dtn = _table_nos_map[_invdata_evid_cond]["ByHHIandDelta"]
-            _stn0 = "Table 3.1" if _stats_grp == "ByHHIandDelta" else "Table 4.1"
+            _stn0 = "Table 4.1" if _stats_grp == "ByFirmCount" else "Table 3.1"
             _stn1, _stn2 = (_dtn.replace(".X", f".{_i}") for _i in ("1", "2"))
 
             _invdata_sub_evid_cond_conc[_dtn] = INVTableData(

{mergeron-2024.739123.8 → mergeron-2024.739125.0}/src/mergeron/gen/enforcement_stats.py

@@ -6,7 +6,7 @@ Methods to format and print summary statistics on merger enforcement patterns.
 import enum
 import shutil
 import subprocess
-from collections.abc import Mapping, Sequence
+from collections.abc import Mapping
 from importlib import resources
 from pathlib import Path
 from types import SimpleNamespace
@@ -94,36 +94,53 @@ moe_tmpl = Template(R"""
     """)
 
 # Define the LaTeX jinja environment
-_tmpl_resource = resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
-_tmpl_folder = DATA_DIR.joinpath(_tmpl_resource.name)
+_template_resource = resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
+_template_folder = DATA_DIR.joinpath(_template_resource.name)
 with resources.as_file(
     resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
 ) as _tmpl_src:
-    if not _tmpl_folder.is_dir():
-        shutil.copytree(_tmpl_src, _tmpl_folder)
-
-LaTeX_jinja_env = Environment(
-    block_start_string=R"((*",
-    block_end_string="*))",
-    variable_start_string=R"\JINVAR{",
-    variable_end_string="}",
-    comment_start_string=R"((#",  # r'#{',
-    comment_end_string=R"#))",  # '}',
-    line_statement_prefix="##",
-    line_comment_prefix="%#",
-    trim_blocks=True,
-    lstrip_blocks=True,
-    autoescape=select_autoescape(disabled_extensions=("tex.jinja2",)),
-    loader=FileSystemLoader(_tmpl_folder),
-)
+    if not _template_folder.is_dir():
+        shutil.copytree(_tmpl_src, _template_folder)
 
 # Place files related to rendering LaTeX in output data directory
 if not (_out_path := DATA_DIR.joinpath(f"{_PKG_NAME}.cls")).is_file():
-    shutil.move(_tmpl_folder / _out_path.name, _out_path)
+    shutil.move(_template_folder / _out_path.name, _out_path)
 
 # Write to LaTeX table settings file
 if not (_DOTTEX := DATA_DIR / Rf"{_PKG_NAME}_TikZTableSettings.tex").is_file():
-    shutil.move(_tmpl_folder.joinpath("setup_tikz_tables.tex"), _DOTTEX)
+    shutil.move(_template_folder / "setup_tikz_tables.tex", _DOTTEX)
+
+
+def create_jinja_env(_tmpl_folder: Path = _template_folder, /) -> Environment:
+    """Create jinja2 environment
+
+    Loader is the FileSystemLoader initialized with the given path as
+    template folder
+
+    Parameters
+    ----------
+    _tmpl_folder : Path
+        Path to template folder
+
+    Returns
+    -------
+    Environment
+        jinja2 environment
+    """
+    return Environment(
+        block_start_string=R"((*",
+        block_end_string="*))",
+        variable_start_string=R"\JINVAR{",
+        variable_end_string="}",
+        comment_start_string=R"((#",  # r'#{',
+        comment_end_string=R"#))",  # '}',
+        line_statement_prefix="##",
+        line_comment_prefix="%#",
+        trim_blocks=True,
+        lstrip_blocks=True,
+        autoescape=select_autoescape(disabled_extensions=("tex.jinja2",)),
+        loader=FileSystemLoader(_tmpl_folder),
+    )
 
 
 LTX_ARRAY_LINEEND = "\\\\\n"
@@ -829,25 +846,33 @@ def propn_ci(
 
 
 def render_table_pdf(
-    _table_dottex_pathlist: Sequence[str], _table_coll_path: str, /
+    _table_collection_design: Template,
+    _table_collection_content: StatsContainer,
+    _output_tex_path: Path,
+    /,
 ) -> None:
-    _table_collection_design = LaTeX_jinja_env.get_template(
-        "mergeron_table_collection_template.tex.jinja2"
-    )
-    _table_collection_content = StatsContainer()
+    """Render table collection to PDF
+
+    Parameters
+    ----------
+    _table_collection_design
+        A jinja2 template for generating the LaTeX file to render
+
+    _table_collection_content
+        Content for jinja2 template
 
-    _table_collection_content.path_list = _table_dottex_pathlist
+    _output_tex_path
+        Path to LaTeX output file to render to PDF
+    """
 
-    with Path(DATA_DIR / _table_coll_path).open(
-        "w", encoding="utf8"
-    ) as _table_coll_file:
-        _table_coll_file.write(
+    with _output_tex_path.open("w", encoding="utf8") as _output_tex_file:
+        _output_tex_file.write(
             _table_collection_design.render(tmpl_data=_table_collection_content)
         )
-        print("\n", file=_table_coll_file)
+        print("\n", file=_output_tex_file)
 
     _run_rc = subprocess.run(  # noqa: S603
-        f"latexmk -f -quiet -synctex=0 -interaction=nonstopmode -file-line-error -pdflua {_table_coll_path}".split(),
+        f"latexmk -f -quiet -synctex=0 -interaction=nonstopmode -file-line-error -pdflua {_output_tex_path}".split(),
         check=True,
         cwd=DATA_DIR,
     )
@@ -855,9 +880,7 @@ def render_table_pdf(
         subprocess.run("latexmk -quiet -c".split(), check=True, cwd=DATA_DIR)  # noqa: S603
     del _run_rc
 
-    print(
-        f"Tables rendered to path, {f"{Path(DATA_DIR / _table_coll_path).with_suffix(".pdf")}"}"
-    )
+    print(f"Tables rendered to path, {_output_tex_path.with_suffix(".pdf")}")
 
 
 if __name__ == "__main__":