merge

bodiyang · Aug 18, 2023 · 8083780 · 8083780
2 parents 40fd48e + 3f6350f
commit 8083780
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 352 deletions.
diff --git a/docs/about/releases.md b/docs/about/releases.md
@@ -3,6 +3,24 @@ Release history
 Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed)
 for a complete commit history.
 
+2023-06-20 Release 3.4.1
+------------------------
+(last merged pull request is
+[#2686](https://github.com/PSLmodels/Tax-Calculator/pull/2686))
+
+**This is an enhancement and bug-fix release.**
+
+**API Changes**
+
+**New Features**
+- Update documentation of use cases [[#2686](https://github.com/PSLmodels/Tax-Calculator/pull/2686) by Jason Debacker]
+- Update the last budget year to 2033 ~ also extend the projections to 2033 [[#2682](https://github.com/PSLmodels/Tax-Calculator/pull/2682) by Bodi Yang]
+
+**Bug Fixes**
+- Reweight PUF data for the year 2033, to fix the odd PUF weightings, PUF ratios and odd projections [[#2685](https://github.com/PSLmodels/Tax-Calculator/pull/2685) by Bodi Yang], with primary work in [[TaxData PR #429](https://github.com/PSLmodels/taxdata/pull/429)by Bodi Yang]
+- Fix incorrect value for EITC_c in 2020 [[#2684](https://github.com/PSLmodels/Tax-Calculator/pull/2684) by Matt Jensen]
+
+
 2023-05-05 Release 3.4.0
 ------------------------
 (last merged pull request is

diff --git a/docs/index.md b/docs/index.md
@@ -51,7 +51,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described
 
 ## Latest release
 
-{doc}`3.4.0 (2023-05-05) <about/releases>`
+{doc}`3.4.1 (2023-06-20) <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 = '3.4.0'
+version = '3.4.1'
 
 config = {
     'description': 'Tax Calculator',
@@ -16,7 +16,7 @@
     'packages': ['taxcalc', 'taxcalc.cli'],
     'include_package_data': True,
     'name': 'taxcalc',
-    'install_requires': ['numpy', 'pandas', 'bokeh', 'numba'],
+    'install_requires': ['setuptools', 'numpy', 'pandas', 'bokeh', 'numba'],
     'classifiers': [
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',

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: 3.4.0
+Version: 3.4.1
 Summary: taxcalc
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator

diff --git a/taxcalc.egg-info/requires.txt b/taxcalc.egg-info/requires.txt
@@ -1,3 +1,4 @@
+setuptools
 numpy
 pandas
 bokeh

diff --git a/taxcalc/__init__.py b/taxcalc/__init__.py
@@ -14,4 +14,4 @@
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '3.4.0'
+__version__ = '3.4.1'
diff --git a/taxcalc/cli/tc.py b/taxcalc/cli/tc.py
@@ -221,8 +221,8 @@ def _compare_test_output_files():
     Private function that compares expected and actual tc --test output files;
     returns 0 if pass test, otherwise returns 1.
     """
-    explines = open(EXPECTED_TEST_OUTPUT_FILENAME, 'U').readlines()
-    actlines = open(ACTUAL_TEST_OUTPUT_FILENAME, 'U').readlines()
+    explines = open(EXPECTED_TEST_OUTPUT_FILENAME, 'r').readlines()
+    actlines = open(ACTUAL_TEST_OUTPUT_FILENAME, 'r').readlines()
     if ''.join(explines) == ''.join(actlines):
         sys.stdout.write('PASSED TEST\n')
         retcode = 0

diff --git a/taxcalc/policy_current_law.json b/taxcalc/policy_current_law.json
@@ -16931,11 +16931,11 @@
             },
             {
                 "year": 2023,
-                "value": 1500.0
+                "value": 1600.0
             },
             {
                 "year": 2024,
-                "value": 1500.0
+                "value": 1600.0
             },
             {
                 "year": 2025,

diff --git a/taxcalc/reforms/rounding2022.json b/taxcalc/reforms/rounding2022.json
@@ -134,6 +134,10 @@
                         "2020": 138,
                         "2021": 180,
                         "2022": 180},
+    "ACTC_c": {"2023": 1600,
+               "2024": 1600,
+               "2025": 1600,
+               "2026": 1000},
     "FST_AGI_thd_lo": {"2019": [1000000, 1000000,  500000, 1000000, 1000000]},
     "FST_AGI_thd_hi": {"2019": [2000000, 2000000, 1000000, 2000000, 2000000]}
             }
diff --git a/taxcalc/tests/cpscsv_agg_expect.csv b/taxcalc/tests/cpscsv_agg_expect.csv
@@ -12,13 +12,13 @@ AMT Income ($b),8319.8,10262.0,10680.4,11012.7,12497.3,13059.3,13639.6,14233.9,1
 AMT Liability ($b),8.1,0.8,0.7,0.6,1.8,1.3,1.1,1.0,1.0,16.7
 AMT Filers (#m),2.6,0.2,0.2,0.1,0.3,0.2,0.2,0.2,0.2,4.0
 Tax before Credits ($b),1116.0,1380.6,1449.5,1505.8,1762.7,1866.0,1913.9,1986.7,2086.0,2309.0
-Refundable Credits ($b),70.8,102.4,102.7,655.0,824.0,98.2,107.2,111.2,112.7,97.9
+Refundable Credits ($b),70.8,102.4,102.7,655.0,824.0,98.2,107.9,111.9,112.7,97.9
 Nonrefundable Credits ($b),32.7,97.2,99.1,99.4,3.2,107.7,107.8,109.1,110.9,29.9
 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 Other Taxes ($b),5.5,10.7,11.3,12.6,13.8,14.4,15.4,15.8,16.4,17.5
-Ind Income Tax ($b),1018.1,1191.6,1259.0,764.0,950.4,1674.6,1714.3,1782.2,1878.8,2198.7
+Ind Income Tax ($b),1018.1,1191.6,1259.0,764.0,950.4,1674.6,1713.6,1781.5,1878.8,2198.7
 Payroll Taxes ($b),1040.8,1141.6,1194.9,1217.9,1318.7,1421.6,1499.5,1571.9,1648.9,1723.0
-Combined Liability ($b),2059.0,2333.2,2453.9,1982.0,2269.1,3096.2,3213.9,3354.0,3527.7,3921.7
+Combined Liability ($b),2059.0,2333.2,2453.9,1982.0,2269.1,3096.2,3213.2,3353.3,3527.7,3921.7
 With Income Tax <= 0 (#m),88.1,96.2,97.0,135.2,127.7,96.0,98.3,99.5,100.1,98.0
 With Combined Tax <= 0 (#m),62.8,65.4,66.4,98.2,97.7,67.7,69.5,70.7,71.6,71.0
 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0

diff --git a/taxcalc/tests/pufcsv_agg_expect.csv b/taxcalc/tests/pufcsv_agg_expect.csv
@@ -12,13 +12,13 @@ AMT Income ($b),10512.6,11427.4,11835.3,12265.7,14381.5,14811.8,15123.1,15662.5,
 AMT Liability ($b),51.3,23.2,24.1,25.1,29.0,28.9,30.1,31.3,32.7,84.2
 AMT Filers (#m),5.7,0.6,0.6,0.3,0.7,0.7,0.6,0.6,0.6,7.1
 Tax before Credits ($b),1708.1,1735.5,1802.2,1887.2,2303.7,2387.2,2353.8,2412.0,2537.2,2784.3
-Refundable Credits ($b),102.9,117.4,118.5,641.9,800.0,119.1,128.5,133.3,136.3,122.4
+Refundable Credits ($b),102.9,117.4,118.5,641.9,800.0,119.1,129.3,134.2,136.3,122.4
 Nonrefundable Credits ($b),67.0,127.3,129.2,128.7,50.4,140.7,137.4,138.0,141.4,74.4
 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 Other Taxes ($b),40.0,44.8,43.6,52.9,83.6,73.6,67.3,64.4,63.9,62.6
-Ind Income Tax ($b),1578.3,1535.5,1598.1,1169.5,1538.0,2200.9,2155.2,2205.1,2323.4,2650.0
+Ind Income Tax ($b),1578.3,1535.5,1598.1,1169.5,1538.0,2200.9,2154.3,2204.2,2323.4,2650.0
 Payroll Taxes ($b),1083.8,1133.3,1185.4,1209.0,1306.0,1403.4,1482.1,1553.4,1629.6,1703.2
-Combined Liability ($b),2662.0,2668.8,2783.5,2378.5,2844.0,3604.3,3637.3,3758.5,3953.0,4353.2
+Combined Liability ($b),2662.0,2668.8,2783.5,2378.5,2844.0,3604.3,3636.4,3757.6,3953.0,4353.2
 With Income Tax <= 0 (#m),92.8,98.6,99.7,131.4,125.0,100.2,102.5,103.9,104.9,101.7
 With Combined Tax <= 0 (#m),63.4,65.6,66.8,102.0,94.5,68.8,70.6,71.9,73.0,72.8
 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0