diff --git a/Makefile b/Makefile index fb1da719..d722eedb 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ test: tmd_files --ignore=tests/test_prepare_targets.py .PHONY=data -data: install tmd_files test warnings +data: install clean format lint tmd_files test warnings .PHONY=warnings warnings: diff --git a/README.md b/README.md index a6cf3660..e496af02 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,7 @@ To generate the TMD files from the PUF files, do this: 1. Copy the two 2015 PUF files to the `tmd/storage/input` folder 2. Install the SIPP files described in `tmd/storage/input/SIPP24/README.md` 3. Install the CEX files described in `tmd/storage/input/CEX23/README.md` -4. Run `make clean` in the repository's top-level folder -5. Run `make data` in the repository's top-level folder +4. Run `make data` in the repository's top-level folder The `make data` command creates and tests the three national `tmd*csv*` data files, which are located in the `tmd/storage/output` diff --git a/setup.py b/setup.py index cf9320e1..23dac65d 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ packages=find_packages(), python_requires=">=3.11,<3.14", install_requires=[ - "taxcalc>=6.5.2", + "taxcalc>=6.5.3", "numpy", "pandas>=3.0.2", "clarabel", diff --git a/tests/test_imputed_variables.py b/tests/test_imputed_variables.py index d0d10aab..f5272c39 100644 --- a/tests/test_imputed_variables.py +++ b/tests/test_imputed_variables.py @@ -107,9 +107,9 @@ def actual_results(rdf, bdf): # https://taxpolicycenter.org/model-estimates/T25-0257 # Note that the $1081 TPC estimate is derived by dividing # the all-unit average of $320 by the 0.296 affpct. - "exp_totben_2022": 60.86, - "exp_affpct_2022": 28.62, - "exp_affben_2022": 1086, + "exp_totben_2022": 58.89, + "exp_affpct_2022": 28.24, + "exp_affben_2022": 1065, }, } output_variables = [