Merge in recent changes on master branch

PSLmodels · Oct 4, 2024 · 28c00a4 · 28c00a4
2 parents 278c4b0 + af96206
commit 28c00a4
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 8 deletions.
diff --git a/docs/about/releases.md b/docs/about/releases.md
@@ -3,6 +3,29 @@ Release history
 Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed)
 for a complete commit history.
 
+
+2024-10-02 Release 4.3.0
+------------------------
+(last merged pull request is
+[#2819](https://github.com/PSLmodels/Tax-Calculator/pull/2819))
+
+**This is an enhancement and bug-fix release.**
+
+**API Changes**
+
+**New Features**
+- Add known values of inflation-indexed policy parameters for 2023 [[#2806](https://github.com/PSLmodels/Tax-Calculator/pull/2806) by Martin Holmer]
+- Enhance `Records.tmd_constructor` static method [[#2809](https://github.com/PSLmodels/Tax-Calculator/pull/2809) by Martin Holmer]
+- Remove TMD data files from Tax-Calculator repository [[#2810](https://github.com/PSLmodels/Tax-Calculator/pull/2810) by Martin Holmer]
+- Add known values of inflation-indexed policy parameters for 2024 [[#2816](https://github.com/PSLmodels/Tax-Calculator/pull/2816) by Martin Holmer]
+- Enhance `extend_tcja.py` and update `reforms/ext.json` [[#2817](https://github.com/PSLmodels/Tax-Calculator/pull/2817) by Martin Holmer]
+- Enhance `ppp.py` script [[#2819](https://github.com/PSLmodels/Tax-Calculator/pull/2819) by Martin Holmer]
+
+**Bug Fixes**
+- Fix specification of domestic production deduction under TCJA [[#2807](https://github.com/PSLmodels/Tax-Calculator/pull/2807) by Martin Holmer]
+- Fix `ALD_BusinessLosses_c` parameter values after 2025 [[#2818](https://github.com/PSLmodels/Tax-Calculator/pull/2818) by Martin Holmer]
+
+
 2024-09-14 Release 4.2.2
 ------------------------
 (last merged pull request is

diff --git a/docs/contributing/RELEASING.md b/docs/contributing/RELEASING.md
@@ -19,7 +19,7 @@ Create new `taxcalc` packages
 
 --> run `python ppp.py`  [to update policy_current_law.json if needed]
 
---> run `python extend_tcja.py > ext.json`  [to update reforms/ext.json if needed]
+--> run `python extend_tcja.py > ext.json`  [to update reforms/ext.json]
 
 --> run `make tctest-jit`  [to make sure JIT decorators are not hiding bugs]
 

diff --git a/docs/index.md b/docs/index.md
@@ -57,7 +57,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described
 
 ## Latest release
 
-{doc}`4.2.2 (2024-09-14) <about/releases>`
+{doc}`4.3.0 (2024-10-02) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 with open("README.md") as f:
     longdesc = f.read()
 
-version = "4.2.2"
+version = "4.3.0"
 
 config = {
     "description": "Tax Calculator",

diff --git a/taxcalc.egg-info/PKG-INFO b/taxcalc.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taxcalc
-Version: 4.2.2
+Version: 4.3.0
 Summary: taxcalc
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator

diff --git a/taxcalc/__init__.py b/taxcalc/__init__.py
@@ -14,4 +14,4 @@
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '4.2.2b'
+__version__ = '4.3.0'
diff --git a/taxcalc/reforms/ext.json b/taxcalc/reforms/ext.json
@@ -1,5 +1,5 @@
 // REFORM TO EXTEND TEMPORARY TCJA PROVISIONS BEYOND 2025
-// USING TAX-CALCULATOR 4.2.2b
+// USING TAX-CALCULATOR 4.3.0
 // WITH 2025-to-2026 INDEXING FACTOR = 1.022000
 //  AND 2028-to-2029 INDEXING FACTOR = 1.019400
 {

diff --git a/update_pcl.py b/update_pcl.py
@@ -326,6 +326,36 @@
         {'year': 2024, 'MARS': 'headhh', 'value': 305000.0},
         {'year': 2024, 'MARS': 'widow', 'value': 610000.0},
     ],
+    'FST_AGI_thd_lo': [  # not part of current-law policy, but needs to be here
+        {'year': 2023, 'MARS': 'single', 'value': 1000000.0},
+        {'year': 2023, 'MARS': 'mjoint', 'value': 1000000.0},
+        {'year': 2023, 'MARS': 'mseparate', 'value': 500000.0},
+        {'year': 2023, 'MARS': 'headhh', 'value': 1000000.0},
+        {'year': 2023, 'MARS': 'widow', 'value': 1000000.0},
+
+        {'year': 2024, 'MARS': 'single', 'value': 1000000.0},
+        {'year': 2024, 'MARS': 'mjoint', 'value': 1000000.0},
+        {'year': 2024, 'MARS': 'mseparate', 'value': 500000.0},
+        {'year': 2024, 'MARS': 'headhh', 'value': 1000000.0},
+        {'year': 2024, 'MARS': 'widow', 'value': 1000000.0},
+
+        # each year's values are the same as for the prior year
+    ],
+    'FST_AGI_thd_hi': [  # not part of current-law policy, but needs to be here
+        {'year': 2023, 'MARS': 'single', 'value': 2000000.0},
+        {'year': 2023, 'MARS': 'mjoint', 'value': 2000000.0},
+        {'year': 2023, 'MARS': 'mseparate', 'value': 1000000.0},
+        {'year': 2023, 'MARS': 'headhh', 'value': 2000000.0},
+        {'year': 2023, 'MARS': 'widow', 'value': 2000000.0},
+
+        {'year': 2024, 'MARS': 'single', 'value': 2000000.0},
+        {'year': 2024, 'MARS': 'mjoint', 'value': 2000000.0},
+        {'year': 2024, 'MARS': 'mseparate', 'value': 1000000.0},
+        {'year': 2024, 'MARS': 'headhh', 'value': 2000000.0},
+        {'year': 2024, 'MARS': 'widow', 'value': 2000000.0},
+
+        # each year's values are the same as for the prior year
+    ],
     # ITEMS NOT PART OF CURRENT-LAW POLICY IN 2022-2025 PERIOD:
     'ALD_Dependents_Child_c': LIST_SCALAR_ZERO,
     'ALD_Dependents_Elder_c': LIST_SCALAR_ZERO,
@@ -349,8 +379,6 @@
     'PT_qbid_ps': LIST_MARS_INF,
     'RPTC_c': LIST_SCALAR_ZERO,
     'CTC_new_ps': LIST_MARS_ZERO,
-    'FST_AGI_thd_lo': LIST_MARS_INF,
-    'FST_AGI_thd_hi': LIST_MARS_INF,
     'AGI_surtax_thd': LIST_MARS_INF,
     'UBI_u18': LIST_SCALAR_ZERO,
     'UBI_1820': LIST_SCALAR_ZERO,