bodiyang · bodiyang · Jul 29, 2024 · Jun 17, 2024 · Jun 18, 2024 · Jun 18, 2024
diff --git a/docs/about/releases.md b/docs/about/releases.md
@@ -3,6 +3,41 @@ Release history
 Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed)
 for a complete commit history.
 
+
+2024-07-21 Release 4.2.0
+------------------------
+(last merged pull request is
+[#2774](https://github.com/PSLmodels/Tax-Calculator/pull/2774))
+
+**This is an enhancement release.**
+
+**API Changes**
+
+**New Features**
+- Add final Phase3 version of tmd input files [[#2774](https://github.com/PSLmodels/Tax-Calculator/pull/2774) by Martin Holmer]
+- Update the `thru74` branch to include final Phase3 tmd input files [[#2755](https://github.com/PSLmodels/Tax-Calculator/pull/2755) by Martin Holmer]
+
+
+2024-07-11 Release 4.1.0
+------------------------
+(last merged pull request is
+[#2772](https://github.com/PSLmodels/Tax-Calculator/pull/2772))
+
+**This is an enhancement and bug-fix release.**
+
+**API Changes**
+
+**New Features**
+- Add ability to use from the Python API custom growfactors files [[#2757](https://github.com/PSLmodels/Tax-Calculator/pull/2757) and [#2771](https://github.com/PSLmodels/Tax-Calculator/pull/2771) by Martin Holmer]
+- Add `tmd_growfactors.csv` file for use with the tmd.csv input file [[#2758](https://github.com/PSLmodels/Tax-Calculator/pull/2758) by Martin Holmer]
+- Add ability to run Tax-Calculator under Python 3.12 [[#2763](https://github.com/PSLmodels/Tax-Calculator/pull/2763) by Martin Holmer]
+- Add `ctc_total` and `ctc_refundable` output variables [[#2765](https://github.com/PSLmodels/Tax-Calculator/pull/2765) and [#2766](https://github.com/PSLmodels/Tax-Calculator/pull/2766) by Martin Holmer]
+- Add exact calculation logic to the `CTC_new` function [[#2769](https://github.com/PSLmodels/Tax-Calculator/pull/2769) by Martin Holmer]
+
+**Bug Fixes**
+- Fix 2018 and 2021 EITC phase-out start parameter values [[#2768](https://github.com/PSLmodels/Tax-Calculator/pull/2768) and [#2770](https://github.com/PSLmodels/Tax-Calculator/pull/2770) by Martin Holmer]
+
+
 2024-06-01 Release 4.0.0
 ------------------------
 (last merged pull request is
@@ -28,7 +63,7 @@ for a complete commit history.
 **API Changes**
 
 **New Features**
-- Adds capabilites to handle `tmd*` files from the tax-microdata repository [[#2740](https://github.com/PSLmodels/Tax-Calculator/pull/2740) by Martin Holmer]
+- Add capabilites to handle `tmd*` files from the tax-microdata repository [[#2740](https://github.com/PSLmodels/Tax-Calculator/pull/2740) by Martin Holmer]
 - Minor updates to documentation, testing, and environment by Martin Holmer and Jason DeBacker in various PRs
 
 2024-04-04 Release 3.5.3

diff --git a/docs/contributing/RELEASING.md b/docs/contributing/RELEASING.md
@@ -7,7 +7,7 @@ Create new `taxcalc` packages
 ===========================
 ```
 
---> on branch X-Y-Z, edit RELEASES.md to finalize X.Y.Z info
+--> on branch X-Y-Z, edit docs/about/releases.md to finalize X.Y.Z info
 
 --> specify release X.Y.Z in setup.py and taxcalc/__init__.py
 
@@ -19,11 +19,11 @@ Create new `taxcalc` packages
 
 --> run `make package`  [to make local taxcalc package available]
 
---> cd taxcalc/validation ; ./tests.sh ; .fix. ; cd ../..
+--> cd taxcalc/validation ; ./tests_35.sh ; .fix. ; cd ../..
 
---> specify release X.Y.Z in index.md
+--> specify release X.Y.Z in docs/index.md
 
---> cd .. ; make clean  [to remove taxcalc package]
+--> make clean  [to remove taxcalc package]
 
 --> commit X-Y-Z branch and push to origin
 

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.0.0 (2024-06-01) <about/releases>`
+{doc}`4.2.0 (2024-07-21) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 

diff --git a/docs/usage/tcja_after_2025.md b/docs/usage/tcja_after_2025.md
@@ -32,6 +32,14 @@ expire).  Compatible input datasets include:
   data, and are available only to those with access to the 2015
   IRS/SOI PUF
 
+Note that if you are using the Python API to Tax-Calculator (as
+described in the
+[Recipes](https://taxcalc.pslmodels.org/recipes/index.html)) to
+analyze the TCJA after 2025 and need to specify custom GrowFactors
+after 2025, you can use the old additive-differences `growdiffs`
+approach or you can specify a custom `growfactors` file as described
+[here](https://github.com/PSLmodels/Tax-Calculator/pull/2757#issuecomment-2218662804).
+
 Before reading the rest of this document, be sure you understand how
 to use the Tax-Calculator command-line tool
 [tc](https://taxcalc.pslmodels.org/guide/cli.html), particularly the
@@ -125,7 +133,7 @@ changes or whenever new historical values of policy parameters are
 added to the `policy_current_law.json` file thereby changing the
 `Policy.LAST_KNOWN_YEAR`.
 
-The 3.5.3 version of Tax-Calculator incorporates the February 2024 CBO
+The 4.0.0 version of Tax-Calculator incorporates the February 2024 CBO
 economic projection and contains historical tax policy parameter values
 through 2022.  Future versions of Tax-Calculator that use historical
 policy parameter values for 2023 and 2024 or use the February 2025 CBO

diff --git a/extend_tcja.py b/extend_tcja.py
@@ -58,7 +58,7 @@
     "STD": {"indexed": True, "category": 4},
     # category 5 ...
     "ID_AllTaxes_c": {"indexed": False, "category": 5},
-    "ID_Charity_crt_all": {"indexed": False, "category": 5},
+    "ID_Charity_crt_cash": {"indexed": False, "category": 5},
     "ID_Casualty_hc": {"indexed": False, "category": 5},
     "ID_Miscellaneous_hc": {"indexed": False, "category": 5},
     "ID_ps": {"indexed": True, "category": 5},

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 with open("README.md") as f:
     longdesc = f.read()
 
-version = "4.0.0"
+version = "4.2.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.0.0
+Version: 4.2.0
 Summary: taxcalc
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -19,18 +19,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: setuptools
-Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: bokeh
-Requires-Dist: numba
-Requires-Dist: requests
-Requires-Dist: paramtools
 
 | | |
 | --- | --- |
 | Org | [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CCO-1.0](https://img.shields.io/badge/OS%20License-CCO%201.0-yellow)](https://github.com/PSLmodels/Tax-Calculator/blob/master/LICENSE) [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://pslmodels.github.io/Tax-Calculator/) |
-| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)|
+| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/)  [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)|
 | Testing | ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/deploy_jupyterbook.yml/badge.svg?branch=master)  [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/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.0.0'
+__version__ = '4.2.0'