mergeron 2025.739415.0__py3-none-any.whl → 2025.739415.1__py3-none-any.whl

mergeron/__init__.py

@@ -15,7 +15,7 @@ from ruamel import yaml
 
 _PKG_NAME: str = Path(__file__).parent.name
 
-VERSION = "2025.739415.0"
+VERSION = "2025.739415.1"
 
 __version__ = VERSION
 

mergeron/core/empirical_margin_distribution.py

@@ -44,7 +44,7 @@ import certifi
 import numpy as np
 import urllib3
 from bs4 import BeautifulSoup
-from joblib import Parallel, delayed  # type: ignore
+from joblib import Parallel, delayed, parallel_config  # type: ignore
 from numpy.random import Generator, SeedSequence
 from python_calamine import CalamineWorkbook
 from scipy import stats  # type: ignore
@@ -137,13 +137,15 @@ def margin_data_resampler(
         ret_array = np.empty(sample_size, float)
 
         _ssz, _ncol = sample_size
-        _threads = min(nthreads, _ncol)
-        dat_list = Parallel(n_jobs=_threads, prefer="threads")(
-            delayed(margin_kde.resample)(
-                _ssz, seed=Generator(DEFAULT_BITGENERATOR(_col_seed))
+        with parallel_config(
+            backend="threading", n_jobs=min(nthreads, _ncol), return_as="generator"
+        ):
+            dat_list = Parallel()(
+                delayed(margin_kde.resample)(
+                    _ssz, seed=Generator(DEFAULT_BITGENERATOR(_col_seed))
+                )
+                for _col_seed in _seed.spawn(_ncol)
             )
-            for _col_seed in _seed.spawn(_ncol)
-        )
 
         for _i in range(_ncol):
             ret_array[:, _i] = dat_list[_i][0]

mergeron/gen/data_generation.py

@@ -8,7 +8,7 @@ from typing import TypedDict
 
 import numpy as np
 from attrs import Attribute, Converter, define, field, validators
-from joblib import Parallel, cpu_count, delayed  # type: ignore
+from joblib import Parallel, cpu_count, delayed, parallel_config  # type: ignore
 from numpy.random import SeedSequence
 from ruamel import yaml
 
@@ -374,16 +374,20 @@ class MarketSample:
             "nthreads": thread_count,
         })
 
-        _threads = min(thread_count, iter_count)
-        res_list = Parallel(n_jobs=_threads, prefer="threads")(
-            delayed(self.__sim_enf_cnts)(
-                _enf_parm_vec,
-                _sim_test_regime,
-                **sim_enf_cnts_kwargs,
-                seed_data=_rng_seed_data_ch,
+        with parallel_config(
+            backend="threading",
+            n_jobs=min(thread_count, iter_count),
+            return_as="generator",
+        ):
+            res_list = Parallel()(
+                delayed(self.__sim_enf_cnts)(
+                    _enf_parm_vec,
+                    _sim_test_regime,
+                    **sim_enf_cnts_kwargs,
+                    seed_data=_rng_seed_data_ch,
+                )
+                for _rng_seed_data_ch in rng_seed_data
             )
-            for _rng_seed_data_ch in rng_seed_data
-        )
 
         res_list_stacks = UPPTestsCounts(*[
             np.stack([getattr(_j, _k) for _j in res_list])

{mergeron-2025.739415.0.dist-info → mergeron-2025.739415.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mergeron
-Version: 2025.739415.0
+Version: 2025.739415.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.739415.0.dist-info → mergeron-2025.739415.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-mergeron/__init__.py,sha256=SqW6Cx_9t4Z8rys4voMYkamaRwVSWl7UMfZNuY0zN2s,6751
+mergeron/__init__.py,sha256=gXwWdZXxa2GW_lQxnMrHsh1lkUdS50uoSl9C87-knMM,6751
 mergeron/core/__init__.py,sha256=4Y_q-Qu7gXENVKHS-lNebn5mPZDy9oPHFwUV7fAW9Nw,3269
-mergeron/core/empirical_margin_distribution.py,sha256=mlxlxab0JOzme7OTI-JoJOM6qQpztkUiB96GXE-zKU4,11647
+mergeron/core/empirical_margin_distribution.py,sha256=61U-KLB563BPWM5zWyWp82c4PhcsAG-IKI0WWYGjBKg,11740
 mergeron/core/ftc_merger_investigations_data.py,sha256=oM4cs2PnyeSwyV1LOE_EYCUEzCKPm7lnCGxLIc6JQY8,28820
 mergeron/core/guidelines_boundaries.py,sha256=Q_udRryyqQAtoB7x2EYGOxI-8JNuyYgoDbFJ_EZAOnM,15606
 mergeron/core/guidelines_boundary_functions.py,sha256=qQbpiNUxsq9AE8SrS628yWlEzqBQdNoVIarFurhuGTY,30304
@@ -10,11 +10,11 @@ mergeron/data/__init__.py,sha256=SAFkR23RBM0zwGam2TeWmw08oHAKmU2YF-Nygj73ies,184
 mergeron/data/damodaran_margin_data_serialized.zip,sha256=Wc1v9buSrYTWWAravG8W9nPbgsU07zMtSAR2RvMQU5s,623482
 mergeron/data/ftc_merger_investigations_data.zip,sha256=tiB2TLFyS9LMSFIv8DBA_oEEx12DU4MyjHni4NlsRMU,24002
 mergeron/gen/__init__.py,sha256=xMnzIqxuWaNZ9HQE-C6kCwLfvwdFOEmlpNRUJsObQFg,23866
-mergeron/gen/data_generation.py,sha256=L44YNtxso-Ya50YT71rnG-el4_PgGn4vtoA7rFDD194,17487
+mergeron/gen/data_generation.py,sha256=pdQl_uBENCjVt2aPtAcus2md4Qx-j5rOWGJJAzdnlO0,17617
 mergeron/gen/data_generation_functions.py,sha256=hXUq5D2CIUkM4_NdGXiOb4XATYwIUeUcCGadzQGDqLw,26126
 mergeron/gen/enforcement_stats.py,sha256=etTax-sBSn8DveF-IxuBJDdX0XSBD6oFU9vaZe6cYks,14387
 mergeron/gen/upp_tests.py,sha256=gRJISQ2jGmIDmFOvaTIkvYooI4mK-QbgkfgL46RrRio,7445
 mergeron/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-mergeron-2025.739415.0.dist-info/METADATA,sha256=vxFoap_3uQ0zNQVtrQ2UayD-QXrybb5sDVSaShHkzUw,4261
-mergeron-2025.739415.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mergeron-2025.739415.0.dist-info/RECORD,,
+mergeron-2025.739415.1.dist-info/METADATA,sha256=zRsnhg6GizME02jjqOkWQSwkrmGXMI2g1inUmjkyQkc,4261
+mergeron-2025.739415.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mergeron-2025.739415.1.dist-info/RECORD,,