Merge pull request #1109 from jdebacker/fix_log

Merging

Author: rickecon

.github/dependabot.yml

@@ -0,0 +1,28 @@
+# Basic `dependabot.yml` file with
+# minimum configuration for three package managers
+
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: "/"
+    # Check the npm registry for updates every week
+    schedule:
+      interval: "weekly"
+
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `root` directory
+    directory: "/"
+    # Check for updates once a week
+    schedule:
+      interval: "weekly"
+
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`
+    # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
+    directory: "/"
+    schedule:
+      interval: "weekly"

CHANGELOG.md

@@ -5,13 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.15.9] - 2026-04-23 03:00:00
+
+### Added
+
+- Create a `ogcore` logging environment so that logging specificed in `ogcore.config` is not overridden by other logging configurations in user code. See PR [#1109](https://github.com/PSLmodels/OG-Core/pull/1109).
+
 ## [0.15.8] - 2026-04-16 00:30:00
 
 ### Added
 
 - Updates the `uv.lock` file to the current version of `ogcore` package (0.15.8)
 - Adds `'**.lock'` to the paths in `build_and_test.yml` so that any changes to the `uv.lock` file trigger the GH Action CI tests in `build_and_test.yml`
 - Incorporates the dependabot updates to `uv.lock` versions from [PR 1105](https://github.com/PSLmodels/OG-Core/pull/1105) and [PR 1106](https://github.com/PSLmodels/OG-Core/pull/1106).
+- Includes [PR 1111](https://github.com/PSLmodels/OG-Core/pull/1111) and [PR 1112](https://github.com/PSLmodels/OG-Core/pull/1112) that change `build_and_test.yml` to not upload CodeCov statistics for PRs generated by dependabots and updates the `codecov-action` to v5.
 
 ## [0.15.7] - 2026-04-15 20:00:00
 
@@ -538,6 +545,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Any earlier versions of OG-USA can be found in the [`OG-Core`](https://github.com/PSLmodels/OG-Core) repository [release history](https://github.com/PSLmodels/OG-Core/releases) from [v.0.6.4](https://github.com/PSLmodels/OG-Core/releases/tag/v0.6.4) (Jul. 20, 2021) or earlier.
 
 
+[0.15.9]: https://github.com/PSLmodels/OG-Core/compare/v0.15.8...v0.15.9
 [0.15.8]: https://github.com/PSLmodels/OG-Core/compare/v0.15.7...v0.15.8
 [0.15.7]: https://github.com/PSLmodels/OG-Core/compare/v0.15.6...v0.15.7
 [0.15.6]: https://github.com/PSLmodels/OG-Core/compare/v0.15.5...v0.15.6

ogcore/SS.py

@@ -8,6 +8,8 @@
 import warnings
 import logging
 
+logger = logging.getLogger(__name__)
+
 if not SHOW_RUNTIME:
     warnings.simplefilter("ignore", RuntimeWarning)
 
@@ -333,9 +335,8 @@ def inner_loop(outer_loop_vars, p, client):
             results = client.gather(futures)
         except Exception as e:
             # Cancel remaining futures and fall back to serial computation
-            import logging
 
-            logging.warning(
+            logger.warning(
                 f"Dask computation failed with error: {e}. "
                 "Falling back to serial computation."
             )
@@ -812,9 +813,9 @@ def SS_solver(
         if iteration > 10:
             if dist_vec[iteration] - dist_vec[iteration - 1] > 0:
                 nu_ss /= 2.0
-                logging.info(f"New value of nu: {nu_ss}")
+                logger.info(f"New value of nu: {nu_ss}")
         iteration += 1
-        logging.info(f"Iteration: {iteration}  Distance: {dist}")
+        logger.info(f"Iteration: {iteration}  Distance: {dist}")
 
     # Generate the SS values of variables, including euler errors
     bssmat_s = np.append(np.zeros((1, p.J)), bmat[:-1, :], axis=0)
@@ -845,7 +846,7 @@ def SS_solver(
         debt_service,
         new_borrowing_f,
     ) = fiscal.get_D_ss(r_gov_ss, Yss, p)
-    logging.info(f"SS debt = {Dss}, {new_borrowing_f}")
+    logger.info(f"SS debt = {Dss}, {new_borrowing_f}")
     w_open = firm.get_w_from_r(p.world_int_rate[-1], p, "SS")
     K_demand_open_ss = np.zeros(p.M)
     for m in range(p.M):
@@ -1103,7 +1104,7 @@ def SS_solver(
     # Fill in arrays, noting that M-1 industries only produce consumption goods
     G_vec_ss = np.zeros(p.M)
     # Map consumption goods back to demands for production goods
-    logging.info(f"IO: {p.io_matrix.T.shape}, C: {C_vec_ss.shape}")
+    logger.info(f"IO: {p.io_matrix.T.shape}, C: {C_vec_ss.shape}")
     C_m_vec_ss = np.dot(p.io_matrix.T, C_vec_ss)
     G_vec_ss[-1] = Gss
     I_d_vec_ss = np.zeros(p.M)
@@ -1124,18 +1125,18 @@ def SS_solver(
         net_capital_outflows_vec,
         RM_vec_ss,
     )
-    logging.info(f"Foreign debt holdings = {D_f_ss}")
-    logging.info(f"Foreign capital holdings = {K_f_ss}")
-    logging.info(f"resource constraint: {RC}")
+    logger.info(f"Foreign debt holdings = {D_f_ss}")
+    logger.info(f"Foreign capital holdings = {K_f_ss}")
+    logger.info(f"resource constraint: {RC}")
 
     if Gss < 0:
-        logging.warning(
+        logger.warning(
             "Steady state government spending is negative to satisfy"
             + " budget"
         )
 
     if ENFORCE_SOLUTION_CHECKS and (max(np.absolute(RC)) > p.RC_SS):
-        logging.warning(f"Resource Constraint Difference: {RC}")
+        logger.warning(f"Resource Constraint Difference: {RC}")
         err = "Steady state aggregate resource constraint not satisfied"
         raise RuntimeError(err)
 
@@ -1144,11 +1145,11 @@ def SS_solver(
 
     euler_savings = euler_errors[: p.S, :]
     euler_labor_leisure = euler_errors[p.S :, :]
-    logging.info(
+    logger.info(
         "Maximum error in labor FOC = "
         f"{np.absolute(euler_labor_leisure).max()}"
     )
-    logging.info(
+    logger.info(
         f"Maximum error in savings FOC = {np.absolute(euler_savings).max()}"
     )
 
@@ -1353,7 +1354,7 @@ def SS_fsolve(guesses, *args):
             + [error_TR]
         )
     error_string = [f"{error:.3e}" for error in errors]
-    logging.info(f"GE loop errors = {error_string}")
+    logger.info(f"GE loop errors = {error_string}")
 
     return errors
 
@@ -1436,7 +1437,7 @@ def run_SS(p, client=None):
                 p.S,
                 p.J,
             ) and np.squeeze(ss_solutions["Y_m"].shape) == (p.M):
-                logging.info("Using previous solutions for SS")
+                logger.info("Using previous solutions for SS")
                 (
                     b_guess,
                     n_guess,
@@ -1497,12 +1498,12 @@ def run_SS(p, client=None):
                     tol=p.mindist_SS,
                 )
             else:
-                logging.warning(
+                logger.warning(
                     "Dimensions of previous solutions for SS do not match"
                 )
                 use_new_guesses = True
         except KeyError:
-            logging.warning("KeyError: previous solutions for SS not found")
+            logger.warning("KeyError: previous solutions for SS not found")
             use_new_guesses = True
     if p.baseline or not p.reform_use_baseline_solution or use_new_guesses:
         # Loop over initial guesses of r and TR until find a solution
@@ -1512,7 +1513,7 @@ def run_SS(p, client=None):
         k = 0
         while not SS_solved and k < len(DEV_FACTOR_LIST) - 1:
             for k, v in enumerate(DEV_FACTOR_LIST):
-                logging.info(
+                logger.info(
                     "SS using initial guess factors for r and TR of "
                     + f"{v[0]} and {v[1]} respectively."
                 )

ogcore/TPI.py

@@ -21,6 +21,8 @@
 import logging
 from distributed import wait
 
+logger = logging.getLogger(__name__)
+
 if not SHOW_RUNTIME:
     warnings.simplefilter("ignore", RuntimeWarning)
 
@@ -597,7 +599,7 @@ def run_TPI(p, client=None):
     ubi = p.ubi_nom_array / factor
     UBI = aggr.get_L(ubi[: p.T], p, "TPI")
 
-    logging.info(
+    logger.info(
         f"Government spending breakpoints are tG1: {p.tG1}; and tG2: {p.tG2}"
     )
 
@@ -828,7 +830,7 @@ def run_TPI(p, client=None):
                 results = client.gather(futures)
             except Exception as e:
                 # Cancel remaining futures and fall back to serial computation
-                logging.warning(
+                logger.warning(
                     f"Dask computation failed with error: {e}. "
                     "Falling back to serial computation for this iteration."
                 )
@@ -1221,27 +1223,27 @@ def run_TPI(p, client=None):
             TR[: p.T] = utils.convex_combo(TR_new[: p.T], TR[: p.T], p.nu)
         guesses_b = utils.convex_combo(b_mat, guesses_b, p.nu)
         guesses_n = utils.convex_combo(n_mat, guesses_n, p.nu)
-        logging.info(
+        logger.info(
             f"w diff: {(wnew[: p.T] - w[: p.T]).max()}, "
             + f"{(wnew[: p.T] - w[: p.T]).min()}"
         )
-        logging.info(
+        logger.info(
             f"r diff: {(rnew[: p.T] - r[: p.T]).max()}, "
             + f"{(rnew[: p.T] - r[: p.T]).min()}"
         )
-        logging.info(
+        logger.info(
             f"r_p diff: {(r_p_new[: p.T] - r_p[: p.T]).max()}, "
             + f"{(r_p_new[: p.T] - r_p[: p.T]).min()}"
         )
-        logging.info(
+        logger.info(
             f"p_m diff: {(new_p_m[: p.T, :] - p_m[: p.T, :]).max()}, "
             + f"{(new_p_m[: p.T, :] - p_m[: p.T, :]).min()}"
         )
-        logging.info(
+        logger.info(
             f"BQ diff: {(BQnew[: p.T] - BQ[: p.T]).max()}, "
             + f"{(BQnew[: p.T] - BQ[: p.T]).min()}"
         )
-        logging.info(
+        logger.info(
             f"TR diff: {(TR_new[: p.T] - TR[: p.T]).max()}, "
             + f"{(TR_new[: p.T] - TR[: p.T]).min()}"
         )
@@ -1266,8 +1268,8 @@ def run_TPI(p, client=None):
         #         nu /= 2
         #         print 'New Value of nu:', nu
         TPIiter += 1
-        logging.info(f"Iteration: {TPIiter}")
-        logging.info(f"Distance: {TPIdist}")
+        logger.info(f"Iteration: {TPIiter}")
+        logger.info(f"Distance: {TPIdist}")
 
     # Compute effective and marginal tax rates for all agents
     num_params = len(p.mtrx_params[0][0])
@@ -1405,9 +1407,9 @@ def run_TPI(p, client=None):
 
     # Compute resource constraint error
     rce_max = np.amax(np.abs(RC_error))
-    logging.info(f"Max absolute value resource constraint error: {rce_max}")
+    logger.info(f"Max absolute value resource constraint error: {rce_max}")
 
-    logging.info("Checking time path for violations of constraints.")
+    logger.info("Checking time path for violations of constraints.")
     for t in range(p.T):
         household.constraint_checker_TPI(
             b_mat[t], n_mat[t], c_mat[t], t, p.ltilde
@@ -1416,8 +1418,8 @@ def run_TPI(p, client=None):
     eul_savings = euler_errors[:, : p.S, :]
     eul_laborleisure = euler_errors[:, p.S :, :]
 
-    logging.info(f"Max Euler error, savings: {np.abs(eul_savings).max()}")
-    logging.info(
+    logger.info(f"Max Euler error, savings: {np.abs(eul_savings).max()}")
+    logger.info(
         f"Max Euler error labor supply: {np.abs(eul_laborleisure).max()}"
     )
 
@@ -1520,7 +1522,7 @@ def run_TPI(p, client=None):
         pickle.dump(output, f)
 
     if np.any(G) < 0:
-        logging.warning(
+        logger.warning(
             "Government spending is negative along transition path"
             + " to satisfy budget"
         )

ogcore/__init__.py

@@ -2,6 +2,7 @@
 Specify what is available to import from the ogcore package.
 """
 
+import ogcore.config  # noqa: F401 -- sets up the ogcore logger on first import
 from ogcore.SS import *  # noqa: F403
 from ogcore.TPI import *  # noqa: F403
 from ogcore.aggregates import *  # noqa: F403
@@ -20,4 +21,4 @@
 from ogcore.txfunc import *  # noqa: F403
 from ogcore.utils import *  # noqa: F403
 
-__version__ = "0.15.8"
+__version__ = "0.15.9"

ogcore/config.py

@@ -25,12 +25,16 @@ def set_logging_level(verbose=True):
     VERBOSE = verbose
     level = logging.INFO if verbose else logging.WARNING
 
-    # Configure the root logger
-    logging.basicConfig(level=level, format="%(message)s")
-
-    # Also set the ogcore logger specifically
+    # Configure the ogcore logger with an explicit StreamHandler so it
+    # works regardless of whether another package (e.g. distributed/dask)
+    # has already called basicConfig() on the root logger.
     logger = logging.getLogger("ogcore")
     logger.setLevel(level)
+    if not logger.handlers:
+        handler = logging.StreamHandler()
+        handler.setFormatter(logging.Formatter("%(message)s"))
+        logger.addHandler(handler)
+    logger.propagate = False
 
     return level
 

ogcore/household.py

@@ -9,6 +9,8 @@
 from ogcore import tax, utils
 import logging
 
+logger = logging.getLogger(__name__)
+
 """
 ------------------------------------------------------------------------
     Functions
@@ -829,29 +831,27 @@ def constraint_checker_SS(bssmat, nssmat, cssmat, ltilde):
         Warnings: if constraints are violated, warnings printed
 
     """
-    logging.info("Checking constraints on capital, labor, and consumption.")
+    logger.info("Checking constraints on capital, labor, and consumption.")
 
     if (bssmat < 0).any():
-        logging.info("WARNING: There is negative capital stock")
+        logger.info("WARNING: There is negative capital stock")
     flag2 = False
     if (nssmat < 0).any():
-        logging.info(
+        logger.info(
             "WARNING: Labor supply violates nonnegativity constraints."
         )
         flag2 = True
     if (nssmat > ltilde).any():
-        logging.info("WARNING: Labor supply violates the ltilde constraint.")
+        logger.info("WARNING: Labor supply violates the ltilde constraint.")
         flag2 = True
     if flag2 is False:
-        logging.info(
+        logger.info(
             "There were no violations of the constraints on labor supply.",
         )
     if (cssmat < 0).any():
-        logging.info(
-            "WARNING: Consumption violates nonnegativity constraints."
-        )
+        logger.info("WARNING: Consumption violates nonnegativity constraints.")
     else:
-        logging.info(
+        logger.info(
             "There were no violations of the constraints on consumption."
         )
 
@@ -876,22 +876,22 @@ def constraint_checker_TPI(b_dist, n_dist, c_dist, t, ltilde):
 
     """
     if (b_dist <= 0).any():
-        logging.info(
+        logger.info(
             "WARNING: Aggregate capital is less than or equal to"
             f" zero in period {t}."
         )
     if (n_dist < 0).any():
-        logging.info(
+        logger.info(
             "WARNING: Labor supply violates nonnegativity"
             f" constraints in period {t}."
         )
     if (n_dist > ltilde).any():
-        logging.info(
+        logger.info(
             "\tWARNING: Labor suppy violates the ltilde constraint",
             " in period %.f." % t,
         )
     if (c_dist < 0).any():
-        logging.info(
+        logger.info(
             "\tWARNING: Consumption violates nonnegativity",
             " constraints in period %.f." % t,
         )