Merge pull request #1074 from jdebacker/ci

Merging

Author: rickecon

CHANGELOG.md

@@ -5,6 +5,11 @@ 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.14.13] - 2025-11-21 12:00:00
+
+### Bug Fix
+
+- Fix calculation of consumption tax revenue with differentiated goods ((PR #1074)[https://github.com/PSLmodels/OG-Core/pull/1074])
 
 ## [0.14.12] - 2025-11-07 12:00:00
 
@@ -465,6 +470,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.14.13]: https://github.com/PSLmodels/OG-Core/compare/v0.14.12...v0.14.13
 [0.14.12]: https://github.com/PSLmodels/OG-Core/compare/v0.14.11...v0.14.12
 [0.14.11]: https://github.com/PSLmodels/OG-Core/compare/v0.14.10...v0.14.11
 [0.14.10]: https://github.com/PSLmodels/OG-Core/compare/v0.14.9...v0.14.10

ogcore/SS.py

@@ -978,7 +978,15 @@ def SS_solver(
         np.squeeze(p.e[-1, :, :]),
         p,
     )
-    sales_tax_ss = tax.cons_tax_liab(cssmat, p_i_ss, p, "SS")
+    c_i = household.get_ci(
+        cssmat,
+        p_i_ss,
+        p_tilde_ss,
+        p.tau_c[-1, :],
+        p.alpha_c,
+        "SS",
+    )
+    sales_tax_ss = tax.cons_tax_liab(c_i, p_i_ss, p, "SS")
     yss_before_tax_mat = household.get_y(
         r_p_ss, wss, bssmat_s, nssmat, p, "SS"
     )

ogcore/TPI.py

@@ -883,7 +883,15 @@ def run_TPI(p, client=None):
             p.e,
             p,
         )
-        sales_tax_mat = tax.cons_tax_liab(c_mat, p_i, p, "TPI")
+        c_i = household.get_ci(
+            c_mat[: p.T, :, :],
+            p_i[: p.T, :],
+            p_tilde[: p.T],
+            p.tau_c[: p.T, :],
+            p.alpha_c,
+            "TPI",
+        )
+        sales_tax_mat = tax.cons_tax_liab(c_i, p_i, p, "TPI")
         C = aggr.get_C(c_mat, p, "TPI")
 
         c_i = household.get_ci(

ogcore/__init__.py

@@ -20,4 +20,4 @@
 from ogcore.txfunc import *
 from ogcore.utils import *
 
-__version__ = "0.14.12"
+__version__ = "0.14.13"

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="ogcore",
-    version="0.14.12",
+    version="0.14.13",
     author="Jason DeBacker and Richard W. Evans",
     license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     description="A general equilibrium overlapping generations model for fiscal policy analysis",