taxcalc 5.2.0__py3-none-any.whl → 5.3.0__py3-none-any.whl

taxcalc/tests/test_pufcsv.py

@@ -46,7 +46,7 @@ def test_agg(tests_path, puf_fullsample):
     calc_start_year = calc.current_year
     # create aggregate diagnostic table (adt) as a Pandas DataFrame object
     adt = calc.diagnostic_table(nyrs).round(1)  # column labels are int
-    taxes_fullsample = adt.loc["Combined Liability ($b)"]
+    taxes_fullsample = adt.loc['Combined Liability ($b)']
     # compare actual DataFrame, adt, with the expected DataFrame, edt
     aggres_path = os.path.join(tests_path, 'pufcsv_agg_expect.csv')
     edt = pd.read_csv(aggres_path, index_col=False)  # column labels are str
@@ -78,10 +78,10 @@ def test_agg(tests_path, puf_fullsample):
     calc_subsample.advance_to_year(START_YEAR)
     adt_subsample = calc_subsample.diagnostic_table(nyrs)
     # compare combined tax liability from full and sub samples for each year
-    taxes_subsample = adt_subsample.loc["Combined Liability ($b)"]
+    taxes_subsample = adt_subsample.loc['Combined Liability ($b)']
     msg = ''
     for cyr in range(calc_start_year, calc_start_year + nyrs):
-        reltol = 0.031  # maximum allowed relative difference in tax liability
+        reltol = 0.045  # maximum allowed relative difference in tax liability
         if not np.allclose(taxes_subsample[cyr], taxes_fullsample[cyr],
                            atol=0.0, rtol=reltol):
             reldiff = (taxes_subsample[cyr] / taxes_fullsample[cyr]) - 1.

taxcalc/tests/test_records.py

@@ -66,7 +66,7 @@ def test_read_cps_data(cps_fullsample):
     assert data.equals(cps_fullsample)
 
 
-@pytest.mark.parametrize("csv", [
+@pytest.mark.parametrize('csv', [
     (
         'RECID,MARS,e00200,e00200p,e00200s\n'
         '1,    2,   200000, 200000,   0.03\n'
@@ -134,21 +134,25 @@ def test_read_data(csv):
 def test_for_duplicate_names():
     """Test docstring"""
     records_varinfo = Records(data=None)
+    num_vars = 0
     varnames = set()
     for varname in records_varinfo.USABLE_READ_VARS:
         assert varname not in varnames
         varnames.add(varname)
         assert varname not in records_varinfo.CALCULATED_VARS
+    num_vars += len(varnames)
     varnames = set()
     for varname in records_varinfo.CALCULATED_VARS:
         assert varname not in varnames
         varnames.add(varname)
         assert varname not in records_varinfo.USABLE_READ_VARS
+    num_vars += len(varnames)
     varnames = set()
     for varname in records_varinfo.INTEGER_READ_VARS:
         assert varname not in varnames
         varnames.add(varname)
         assert varname in records_varinfo.USABLE_READ_VARS
+    assert num_vars == 212  # number of vars in records_variables.json
 
 
 def test_records_variables_content(tests_path):

taxcalc/tests/test_reforms.py

@@ -73,8 +73,19 @@ def test_2017_law_reform(tests_path):
             assert act == exp, f'{name} a={act} != e={exp}'
 
 
+def _apply_reform(policy, reform_path):
+    """
+    Helper function to apply a reform and assert no errors.
+    """
+    with open(reform_path, 'r', encoding='utf-8') as rfile:
+        rtext = rfile.read()
+    policy.implement_reform(Policy.read_json_reform(rtext))
+    assert not policy.parameter_errors
+    assert not policy.errors
+
+
 @pytest.mark.rtr
-@pytest.mark.parametrize('fyear', [2019, 2020, 2021, 2022, 2023])
+@pytest.mark.parametrize('fyear', [2019, 2020, 2021, 2022, 2023, 2024, 2025])
 def test_round_trip_reforms(fyear, tests_path):
     """
     Check that current-law policy has the same policy parameter values in
@@ -83,7 +94,7 @@ def test_round_trip_reforms(fyear, tests_path):
     reforms that represents new tax legislation since 2017.
     This test checks that the future-year parameter values for
     current-law policy (which incorporates recent legislation such as
-    the TCJA, CARES Act, and ARPA) are the same as future-year
+    the TCJA, CARES Act, ARPA, and OBBBA) are the same as future-year
     parameter values for the compound round-trip reform.
     Doing this check ensures that the 2017_law.json
     and subsequent reform files that represent recent legislation are
@@ -97,48 +108,21 @@ def test_round_trip_reforms(fyear, tests_path):
     clp_mdata = dict(clp_pol.items())
     # create rtr metadata dictionary for round-trip reform in fyear
     rtr_pol = Policy()
-    # Revert to 2017 law
-    reform_file = os.path.join(tests_path, '..', 'reforms', '2017_law.json')
-    with open(reform_file, 'r', encoding='utf-8') as rfile:
-        rtext = rfile.read()
-    rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_errors
-    assert not rtr_pol.errors
-    # Layer on TCJA
-    reform_file = os.path.join(tests_path, '..', 'reforms', 'TCJA.json')
-    with open(reform_file, 'r', encoding='utf-8') as rfile:
-        rtext = rfile.read()
-    rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_errors
-    assert not rtr_pol.errors
-    # Layer on the CARES Act
-    reform_file = os.path.join(tests_path, '..', 'reforms', 'CARES.json')
-    with open(reform_file, 'r', encoding='utf-8') as rfile:
-        rtext = rfile.read()
-    rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    # Layer on the Consolidated Appropriations Act of 2021
-    reform_file = os.path.join(
-        tests_path, '..', 'reforms', 'ConsolidatedAppropriationsAct2021.json'
-    )
-    with open(reform_file, 'r', encoding='utf-8') as rfile:
-        rtext = rfile.read()
-    rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_errors
-    assert not rtr_pol.errors
-    # Layer on ARPA
-    reform_file = os.path.join(tests_path, '..', 'reforms', 'ARPA.json')
-    with open(reform_file, 'r', encoding='utf-8') as rfile:
-        rtext = rfile.read()
-    rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_errors
-    assert not rtr_pol.errors
-    # Layer on rounding from IRS through Policy.LAST_KNOWN_YEAR
-    reform_file = os.path.join(tests_path, '..', 'reforms', 'rounding.json')
-    with open(reform_file, 'r', encoding='utf-8') as rfile:
-        rtext = rfile.read()
-    rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_errors
-    assert not rtr_pol.errors
+
+    reform_files_to_apply = [
+        '2017_law.json',
+        'TCJA.json',
+        'CARES.json',
+        'ConsolidatedAppropriationsAct2021.json',
+        'ARPA.json',
+        'OBBBA.json',
+        'rounding.json'
+    ]
+    for reform_filename in reform_files_to_apply:
+        reform_file_path = os.path.join(tests_path, '..',
+                                        'reforms', reform_filename)
+        _apply_reform(rtr_pol, reform_file_path)
+
     rtr_pol.set_year(fyear)
     rtr_mdata = dict(rtr_pol.items())
     # compare fyear policy parameter values
@@ -158,7 +142,7 @@ def test_round_trip_reforms(fyear, tests_path):
         clp_val = clp_mdata[pname]
         if not np.allclose(rtr_val, clp_val):
             fail_params.append(pname)
-            msg += '\n  {pname} in {fyear} : rtr={rtr_val} clp={clp_val}'
+            msg += f'\n  {pname} in {fyear} : rtr={rtr_val} clp={clp_val}'
             if fail_dump:
                 rtr_fails.write(f'{pname} {fyear} {rtr_val}\n')
                 clp_fails.write(f'{pname} {fyear} {clp_val}\n')
@@ -169,8 +153,23 @@ def test_round_trip_reforms(fyear, tests_path):
         raise ValueError(msg)
 
 
+REFORM_DIR = os.path.join(os.path.dirname(__file__), '..', 'reforms')
+REFORM_FILES = glob.glob(os.path.join(REFORM_DIR, '*.json'))
+REFORM_YEARS = {
+    'ARPA.json': 2022,
+    'ext.json': 2026,
+    'NoOBBBA.json': 2026,
+    'OBBBA.json': 2026,
+}
+
+
 @pytest.mark.reforms
-def test_reform_json_and_output(tests_path):
+@pytest.mark.parametrize(
+    'reform_file,tax_year',
+    [(os.path.basename(f), REFORM_YEARS.get(os.path.basename(f), 2020))
+     for f in REFORM_FILES],
+)
+def test_reform_json_and_output(reform_file, tax_year, tests_path):
     """
     Check that each JSON reform file can be converted into a reform dictionary
     that can then be passed to the Policy class implement_reform method that
@@ -213,7 +212,6 @@ def test_reform_json_and_output(tests_path):
         return not diffs
 
     # specify Records object containing cases data
-    tax_year = 2020
     cases_path = os.path.join(tests_path, '..', 'reforms', 'cases.csv')
     cases = Records(data=cases_path,
                     start_year=tax_year,  # set raw input data year
@@ -226,9 +224,10 @@ def test_reform_json_and_output(tests_path):
     calc = Calculator(policy=Policy(), records=cases, verbose=False)
     calc.advance_to_year(tax_year)
     calc.calc_all()
-    res_path = cases_path.replace('cases.csv', 'clp.res.csv')
+    clp_base = cases_path.replace('cases.csv', f'clp-{tax_year}')
+    res_path = clp_base + '.res.csv'
     write_res_file(calc, res_path)
-    if res_and_out_are_same(res_path.replace('.res.csv', '')):
+    if res_and_out_are_same(clp_base):
         os.remove(res_path)
     else:
         failures.append(res_path)
@@ -237,33 +236,29 @@ def test_reform_json_and_output(tests_path):
     pre_tcja_jrf = os.path.join(tests_path, '..', 'reforms', '2017_law.json')
     pre_tcja = Policy.read_json_reform(pre_tcja_jrf)
     # check reform file contents and reform results for each reform
-    reforms_path = os.path.join(tests_path, '..', 'reforms', '*.json')
-    json_reform_files = glob.glob(reforms_path)
-    for jrf in json_reform_files:
-        if jrf.endswith('ext.json'):
-            continue  # skip ext.json, which is tested below in test_ext_reform
-        # determine reform's baseline by reading contents of jrf
-        with open(jrf, 'r', encoding='utf-8') as rfile:
-            jrf_text = rfile.read()
-        pre_tcja_baseline = 'Reform_Baseline: 2017_law.json' in jrf_text
-        # implement the reform relative to its baseline
-        reform = Policy.read_json_reform(jrf_text)
-        pol = Policy()  # current-law policy
-        if pre_tcja_baseline:
-            pol.implement_reform(pre_tcja)
-            assert not pol.parameter_errors
-        pol.implement_reform(reform)
+    jrf = os.path.join(tests_path, '..', 'reforms', reform_file)
+    # determine reform's baseline by reading contents of jrf
+    with open(jrf, 'r', encoding='utf-8') as rfile:
+        jrf_text = rfile.read()
+    pre_tcja_baseline = 'Reform_Baseline: 2017_law.json' in jrf_text
+    # implement the reform relative to its baseline
+    reform = Policy.read_json_reform(jrf_text)
+    pol = Policy()  # current-law policy
+    if pre_tcja_baseline:
+        pol.implement_reform(pre_tcja)
         assert not pol.parameter_errors
-        calc = Calculator(policy=pol, records=cases, verbose=False)
-        calc.advance_to_year(tax_year)
-        calc.calc_all()
-        res_path = jrf.replace('.json', '.res.csv')
-        write_res_file(calc, res_path)
-        if res_and_out_are_same(res_path.replace('.res.csv', '')):
-            os.remove(res_path)
-        else:
-            failures.append(res_path)
-        del calc
+    pol.implement_reform(reform)
+    assert not pol.parameter_errors
+    calc = Calculator(policy=pol, records=cases, verbose=False)
+    calc.advance_to_year(tax_year)
+    calc.calc_all()
+    res_path = jrf.replace('.json', '.res.csv')
+    write_res_file(calc, res_path)
+    if res_and_out_are_same(res_path.replace('.res.csv', '')):
+        os.remove(res_path)
+    else:
+        failures.append(res_path)
+    del calc
     if failures:
         msg = 'Following reforms have res-vs-out differences:\n'
         for ref in failures:
@@ -358,32 +353,39 @@ def test_reforms(rid, test_reforms_init, tests_path, baseline_2017_law,
         afile.write(f'{actual}\n')
 
 
-@pytest.mark.extend_tcja
-def test_ext_reform(tests_path):
+@pytest.mark.cps
+@pytest.mark.parametrize('reform_filename, expected_diff', [
+    ('ext.json', 45.491),
+    ('OBBBA.json', 0.0),
+    ('NoOBBBA.json', 292.402),
+])
+def test_reforms_cps(reform_filename, expected_diff, tests_path):
     """
-    Test ext.json reform that extends TCJA beyond 2025.
+    Test reforms beyond 2025 using public CPS data.
     """
-    # test syntax of ext.json reform file
-    end = Policy()
-    end.set_year(2026)
-    ext = Policy()
-    reform_file = os.path.join(tests_path, '..', 'reforms', 'ext.json')
+    pol = Policy()
+    reform_file = os.path.join(tests_path, '..', 'reforms', reform_filename)
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
-    ext.implement_reform(Policy.read_json_reform(rtext))
-    assert not ext.parameter_errors
-    ext.set_year(2026)
-    assert np.allclose([ext.II_em], [end.II_em])
-    # test tax output generated by ext.json reform file using public CPS data
+    pol.implement_reform(Policy.read_json_reform(rtext))
+    assert not pol.parameter_errors
+
     recs = Records.cps_constructor()
-    calc_end = Calculator(policy=end, records=recs, verbose=False)
-    calc_end.advance_to_year(2026)
-    calc_end.calc_all()
-    iitax_end = calc_end.array('iitax')
-    calc_ext = Calculator(policy=ext, records=recs, verbose=False)
-    calc_ext.advance_to_year(2026)
-    calc_ext.calc_all()
-    iitax_ext = calc_ext.array('iitax')
-    rdiff = iitax_ext - iitax_end
-    weighted_sum_rdiff = (rdiff * calc_end.array('s006')).sum() * 1.0e-9
-    assert np.allclose([weighted_sum_rdiff], [45.491], rtol=0.0, atol=0.01)
+
+    # create a Calculator object using current-law policy
+    calc_clp = Calculator(policy=Policy(), records=recs, verbose=False)
+    calc_clp.advance_to_year(2026)
+    calc_clp.calc_all()
+    iitax_clp = calc_clp.array('iitax')
+
+    # create a Calculator object using the reform
+    calc_ref = Calculator(policy=pol, records=recs, verbose=False)
+    calc_ref.advance_to_year(2026)
+    calc_ref.calc_all()
+    iitax_ref = calc_ref.array('iitax')
+
+    # compare aggregate individual income tax liability
+    rdiff = iitax_ref - iitax_clp
+    weighted_sum_rdiff = (rdiff * calc_clp.array('s006')).sum() * 1.0e-9
+    assert np.allclose([weighted_sum_rdiff], [expected_diff],
+                       rtol=0.0, atol=0.01)

taxcalc/tests/test_taxcalcio.py

@@ -392,12 +392,18 @@ def test_ctor_init_with_cps_files():
     assert tcio.errmsg
 
 
-@pytest.mark.parametrize("dumpvar_str, str_valid, num_vars", [
+@pytest.mark.parametrize('dumpvar_str, str_valid, num_vars', [
     ("""
     MARS;iitax	payrolltax|combined,
     c00100
     surtax
-    """, True, 6),  # these 6 parameters minus MARS plus RECID
+    """, True, 6),  # these 6 variables minus MARS plus RECID
+
+    ('ALL', True, 209),
+    # 209 =
+    # all 212 vars in records_variables.json (see test_records.py)
+    # minus 5 TaxCalcIO.BASE_DUMPVARS omitting RECID (see taxcalcio.py)
+    # plus 2 TaxCalcIO.MTR_DUMPVARS (see taxcalcio.py)
 
     ("""
     MARS;iitax	payrolltax|kombined,c00100
@@ -743,7 +749,7 @@ def test_error_message_parsed_correctly(regression_reform_file):
               exact_calculations=False)
     assert isinstance(tcio.errmsg, str) and tcio.errmsg
     exp_errmsg = (
-        "AMEDT_rt[year=2021] 1.8 > max 1 \n"
-        "AMEDT_rt[year=2021] 1.8 > max 1 "
+        'AMEDT_rt[year=2021] 1.8 > max 1 \n'
+        'AMEDT_rt[year=2021] 1.8 > max 1 '
     )
     assert tcio.errmsg == exp_errmsg

taxcalc/utils.py

@@ -387,7 +387,7 @@ def create_distribution_table(vdf, groupby, income_measure,
         dist_table.iloc[11] = topdec_row
         del topdec_row
     else:
-        dist_table.loc["ALL"] = sum_row
+        dist_table.loc['ALL'] = sum_row
     del sum_row
     # ensure dist_table columns are in correct order
     assert dist_table.columns.values.tolist() == DIST_TABLE_COLUMNS
@@ -580,7 +580,7 @@ def create_difference_table(vdf1, vdf2, groupby, tax_to_diff,
         diff_table.iloc[11] = topdec_row
         del topdec_row
     else:
-        diff_table.loc["ALL"] = sum_row
+        diff_table.loc['ALL'] = sum_row
     # delete intermediate Pandas DataFrame objects
     del gdf
     del dframe
@@ -1603,7 +1603,7 @@ def json_to_dict(jsontext):
             # if the 2nd group (capturing comments) is not None,
             # it means we have captured a non-quoted (real) comment string.
             if match.group(2) is not None:
-                return "\n"  # preserve line numbers
+                return '\n'  # preserve line numbers
             # otherwise, we will return the 1st group
             return match.group(1)  # captured quoted-string
         # begin main remove_comments function logic

{taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxcalc
-Version: 5.2.0
+Version: 5.3.0
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -12,9 +12,9 @@ Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -36,7 +36,7 @@ Dynamic: summary
 | | |
 | --- | --- |
 | 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.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)|
+| Package | [![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/) [![Python 3.13](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3131/)  [![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) |
 
 
@@ -57,6 +57,3 @@ explains the workflow involved in contributing model enhancements.
 
 Complete documentation is available
 [here](https://PSLmodels.github.io/Tax-Calculator/).
-This documentation includes
-[examples](https://taxcalc.pslmodels.org/usage/tcja_after_2025.html)
-of how to analyze different ways of extending TCJA policy beyond 2025.

{taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/RECORD

@@ -1,36 +1,36 @@
-taxcalc/__init__.py,sha256=envt-d8N73t_pQxUfxlv5-ZE1D2PRP2rNsfyaAcFUPs,536
-taxcalc/calcfunctions.py,sha256=WpBHk5dRRDNmIvt1S4-Nua4urKqBFUFswWsh6Wbi0ac,135517
-taxcalc/calculator.py,sha256=yySfH1FLXgRrjxsI5aLsZNwqWG5ahF33z3dVeLNTe_Y,64135
+taxcalc/__init__.py,sha256=5kXLxekmfAIGKSaI0ownFFGPUYrcMHVGjsgkyQE-KgA,536
+taxcalc/calcfunctions.py,sha256=8XUhXncnsRkqDL-3uqH1Ew2HIMs3p-gf97KHRKnJZJM,135517
+taxcalc/calculator.py,sha256=nO4GM9pCY4vvmXMcExc9cgEfrMJj-A6Z9aKODHdjPLQ,64135
 taxcalc/conftest.py,sha256=nO4J7qu1sTHgjqrzhpRMvfMJUrNm6GP_IsSuuDt_MeQ,141
 taxcalc/consumption.json,sha256=FbGpsLP0W02sYc7o8N-BVz8Xw8hfk_gCr5MtHtgEBQQ,7615
 taxcalc/consumption.py,sha256=pkXhFGpFqu7hW62KaTctfRSzR-pXzMB1ai8XCQRAgXk,3480
 taxcalc/cps.csv.gz,sha256=SS6tSduU_Eu0EJwzpslnmqMsQQQucVMzzITfH-SeV40,9851074
 taxcalc/cps_weights.csv.gz,sha256=-k31Swqss0WEGA3Zo8AoReLR_C7BRUk4PDmfh-oVVyo,13657706
-taxcalc/data.py,sha256=QRyLsq250OsxUIjsuCFtREJsVyEOGaivwcON3teivMI,11698
-taxcalc/decorators.py,sha256=EwyVH4fSDf8x_BHzccf4-DRopo6KMVidYSYZFy_dJy0,11307
+taxcalc/data.py,sha256=gCdPszWUgPP5kCSpsAiL_4ytC6j32TVaiaEqjnqZAgc,11698
+taxcalc/decorators.py,sha256=C8H4IpdCzioI0-aTCNHVjIxWsGh-_EZWryDEox2Dt1Q,11331
 taxcalc/growdiff.json,sha256=GCMuFsHv5qP2HBzqiev3CbFJy0BXnhM2ShaPT2QuNTs,14601
 taxcalc/growdiff.py,sha256=Q3St-KPIUN2I_l1S0jwN0yr8O4LuzkNIU-_qbXTkrZw,2977
 taxcalc/growfactors.csv,sha256=URIGSKApCY4McvdILkCaIm8EhCGEME2Du-ef5Q9c0uE,5134
-taxcalc/growfactors.py,sha256=dW71yYKhFDbFtGpBT-kZBqY4MV7IswKcNI3_c-X_Nfg,6525
+taxcalc/growfactors.py,sha256=OrYmlWMQAmoMe5fhgnPJcIdvFs0aDf9JBy2aU7J0kBQ,6576
 taxcalc/parameters.py,sha256=ObwQMBlPjq3tyNwiR94Nj0zouIVsNaHIho-OQK1RNKg,35966
-taxcalc/policy.py,sha256=G8-3ZMS_O9OD_uaG4xZZxsv9nnlPblDqoyQQzGEXHuM,9367
-taxcalc/policy_current_law.json,sha256=1OsYLipwDvbUN2Ph6KnHAAKVW4HJiDgSKN0UqS1Bfjs,623682
-taxcalc/puf_ratios.csv,sha256=USMM79UEX8PnSKY_LYLxvACER_9NHyj4ipNEk2iyykQ,3580
-taxcalc/puf_weights.csv.gz,sha256=35iZhzFO0dHUI2zf4_liyk60E-3Sgr_AbxszGxw7LfM,13522484
+taxcalc/policy.py,sha256=e24edxUHND-WujHZl_FUp6h9ECgeC3sRu908vom7qjs,9415
+taxcalc/policy_current_law.json,sha256=_8OHMh4VsK4VJ7LN5aGQX_b_UbimYDqzsEt8P6NZaw4,608288
+taxcalc/puf_ratios.csv,sha256=Zt7PPQXpjF4gbegML3S0rxP7Egw871qhnIoxu7u6vko,3580
+taxcalc/puf_weights.csv.gz,sha256=FKlNlk-p9CrTLODkmTitTgg7iBTE4iYMnOd1y9ocuao,13613549
 taxcalc/records.py,sha256=zz-q7rNFUBqDLaDYjcScfwf22zzSw-XEew00HGWB0Ho,18397
 taxcalc/records_variables.json,sha256=JQjaXOS-QyJLDMl_3K4WyCNyRmJpxho3vC_gik5g04Y,42681
-taxcalc/taxcalcio.py,sha256=_ylnC-dZUpDFn79F8pjkZEq-wJhPCQA7Ig9SRLyhrUA,37691
-taxcalc/utils.py,sha256=Wsvni2UP7WgnByN4bRIiLGgamDFwfQoexiy420o6ewY,63666
+taxcalc/taxcalcio.py,sha256=TR29dAdYer85Bo8HFljt9dYqsIL7AvmWx0xRe3-ZNpY,38543
+taxcalc/utils.py,sha256=R12cGWrhVNNxuWfXVVlWiu5FGoxyX9tzrO_iKsW8mjg,63666
 taxcalc/utilsprvt.py,sha256=iIyWp9-N3_XWjQj2jV2CWnJy7vrNlKB2_vIMwYjgbWY,1323
 taxcalc/assumptions/ASSUMPTIONS.md,sha256=cFQqWn1nScaladVaQ7xNm1jDY8CsGdLmqZEzUZeRrb8,1917
 taxcalc/assumptions/README.md,sha256=Ww55r2zH1neoRSl_MawrPmX-ugaztIZ7_ALrquuatdQ,809
 taxcalc/assumptions/economic_assumptions_template.json,sha256=utMk38GwSQFrkOAtRrDVhMQLpfaZH3JmtTznKX7IouM,2610
 taxcalc/cli/__init__.py,sha256=cyZ0tdx41j_vV_B6GAkqJmNKKG-B0wUC0ThC75lJlk4,104
-taxcalc/cli/tc.py,sha256=hGkP-XHkvx0MoFdHf-BjUnKqAxQBRtk8Vv4uqtIGuRY,18760
+taxcalc/cli/tc.py,sha256=m8KRiR0sUS3w2q0WhSwowYb-GCzRcbvfqOhc_-GR1OM,18982
 taxcalc/reforms/2017_law.json,sha256=4QHE3gMKueXD3M97ODqA0LjofXUfSmwVvJA1FLclaqQ,5264
 taxcalc/reforms/2017_law.out.csv,sha256=nnNKXqY2kof8HC1nnU8srPsvNNepi6ISXQ9OJpQnT7M,473
 taxcalc/reforms/ARPA.json,sha256=6oGn3pZ4clAhjFHvqpmm7sXcm407Ea_8mjJchSscKpc,3203
-taxcalc/reforms/ARPA.out.csv,sha256=qSUdI0LoQFGG6h24eT-249pLEqmxmt7TvLrv1HX_y3Y,475
+taxcalc/reforms/ARPA.out.csv,sha256=NBH9eOO_NYmr6FyIHK9AS0paof7o6Rz6AHODvEo-uLU,476
 taxcalc/reforms/BrownKhanna.json,sha256=yydcFsixV28p1I5uB0VgwJJ5GyGL0JU8K-IUwrPHlzs,964
 taxcalc/reforms/BrownKhanna.out.csv,sha256=D2pPxtH5RyMnf8wQad3R2W1Uh4ZLXa7MAQ_dQccMkPA,475
 taxcalc/reforms/CARES.json,sha256=lTAt0waGCgyUZ3ayrBOoiifqJYVgf19JHdqGusg400o,1977
@@ -53,7 +53,6 @@ taxcalc/reforms/Trump2016.out.csv,sha256=TXPSVmc3rE-6-RTVjk632A041e3_p8WW6IjoyYi
 taxcalc/reforms/Trump2017.json,sha256=sCaQkvFY66VPQa6GUzKbrsH5R3BxOcBwMuHE9Ypv0HU,1544
 taxcalc/reforms/Trump2017.out.csv,sha256=By1quzZONFLQGK5E76mbNNFuORZ8aCGHpD1BR5iwTS8,474
 taxcalc/reforms/cases.csv,sha256=JQ0LSnNeyl6xSgW5mimGUJMr7xwCWTOpiOpfwx2ETsg,570
-taxcalc/reforms/clp.out.csv,sha256=qSUdI0LoQFGG6h24eT-249pLEqmxmt7TvLrv1HX_y3Y,475
 taxcalc/reforms/ext.json,sha256=pD8bTjtb7NuYVrOd1IT8pqscKRMX2_5hkrTOQceSiVw,2309
 taxcalc/reforms/growfactors_ext.csv,sha256=E0szWXtgV5jcpiyvREOz1yXw_poPIBC77bBQI1rlFxM,17733
 taxcalc/reforms/ptaxes0.json,sha256=QkvqCVkI23sF7FvTHqaUYNpEJYuHNChbKwH0mH7Otp4,1718
@@ -75,34 +74,34 @@ taxcalc/reforms/archive/TCJA_Senate_120117.json,sha256=hruGq8bVtJEMmSsOIuTcWiYON
 taxcalc/tests/benefits_expect.csv,sha256=CFpMpg8a-5iNVSRnmCnl9dncwXx6eGn-KSnTJ2GqmS4,4833
 taxcalc/tests/cmpi_cps_expect.txt,sha256=NCyG3XhgnV8qJe9TaF9l-9yUuwNfANNDvFn1HcSfZ1c,6262
 taxcalc/tests/cmpi_puf_expect.txt,sha256=dtHBPDY23qttxjQsPpxhLYoUId1tnPZ4uNHx49NlZ0s,6264
-taxcalc/tests/conftest.py,sha256=jziEwugOsHJT2YohMxLAR0MZjjaynZJY7flj4lmBn8Q,5164
+taxcalc/tests/conftest.py,sha256=HT5faHHoYgyRzOOyhP1EzUfie7l9TmiBAqgC_y9F0M4,5164
 taxcalc/tests/cpscsv_agg_expect.csv,sha256=80Sq2GlP2oz4vKJfrarYy4qRGWNxUs7DSBYV2qxesGk,3511
-taxcalc/tests/puf_var_correl_coeffs_2016.csv,sha256=o6Ly5au_J1npbIFQrqP2mwbI6Zc8yJrAOk8fzVRvreU,57314
-taxcalc/tests/puf_var_wght_means_by_year.csv,sha256=qEd_73jgAbMpvSM9I-PU50HDbuTgZzpvbU6DJ4M8vrw,12889
-taxcalc/tests/pufcsv_agg_expect.csv,sha256=DNeYZ2PFTQxpEDA_Qk5HefUez51shk3HpLnoMoof88Q,3545
-taxcalc/tests/pufcsv_mtr_expect.txt,sha256=MGOK4bV5ACNPtgfhj7cNOcZSkRcEREuZCT5dzju-yC4,4265
-taxcalc/tests/reforms.json,sha256=JOzgOi3DGAGXLslWZtxWPe81UfvDR73OPe1t-MPAXeE,17097
-taxcalc/tests/reforms_expect.csv,sha256=DJRO1LF8n6CX5viq3-uufqBF19hlVcqSq0T3EYgQQas,1363
-taxcalc/tests/test_4package.py,sha256=1qhmDS3bdfNHNgz4pggaE6LduT3KKUtOsdtqP3QSIYQ,3601
+taxcalc/tests/puf_var_correl_coeffs_2016.csv,sha256=lQXyUEa9wAyhUEOtYm5j0p-cnzyswmViCNJwa22hztg,57314
+taxcalc/tests/puf_var_wght_means_by_year.csv,sha256=ReclabBk9MVO8p1y62h9xNDoFw9anjXe8BmKiFEr0hk,12889
+taxcalc/tests/pufcsv_agg_expect.csv,sha256=H9TCOhi_EksKNVa-Sp56cMGBxpCAD57xs3CHXzQNhp0,3545
+taxcalc/tests/pufcsv_mtr_expect.txt,sha256=Y5-4ulrq2QWCceGhCQc60N2ulc7YTq7w-qf11mB74Os,4265
+taxcalc/tests/reforms.json,sha256=dIP28djWy-fkPRI5gn7oXHLx_-bzB8KMlS77-1x8Ccc,17193
+taxcalc/tests/reforms_expect.csv,sha256=iIYLn3Ck8UFFcoDikWs1Qq4xEs1_R7ZSKKEQIVgE_18,1363
+taxcalc/tests/test_4package.py,sha256=bB8aHmeOchYPTdSYrzwQD3X5Gr-FmCdyu0Ykv3SSjaA,3573
 taxcalc/tests/test_benefits.py,sha256=oaui5mO0TuW8Ht-uxvUCBL5zM3iTENq3Whyf_gEpY1U,3392
 taxcalc/tests/test_calcfunctions.py,sha256=7uD1EW48TgsEE6pNHIxkXNi9gvZR7dbT7il6jAqgy9s,34653
-taxcalc/tests/test_calculator.py,sha256=OPgukA61FEBidSX03VvdINhFJngg1S9CytYr67Luu24,33672
-taxcalc/tests/test_compare.py,sha256=WglH4ZJOEQnav_mAmnGjpb7dooXcQsB1m04hgQeoBUQ,10873
+taxcalc/tests/test_calculator.py,sha256=ppWmnlNrjlLUjAwgs-hamATH4telAhKWkB6kbx3uNJQ,33672
+taxcalc/tests/test_compare.py,sha256=W7rcMaCt8l0pmL9QAXdXqnfn6ehtpEoBW2_D82WJs9U,10873
 taxcalc/tests/test_compatible_data.py,sha256=MP-DZXrBJ_2ftuxHchl3EGOhPnP5pnnrSQOM9POSx0c,13224
-taxcalc/tests/test_consumption.py,sha256=c6zi9GqNK54cgfzxiWmY10UxOMJZ9vd9fOTwUKU1zMk,6318
-taxcalc/tests/test_cpscsv.py,sha256=eiCZ1TUtRDyTcs7rnQ_8cxEGV04-YsOhT4caKDLejYM,8410
+taxcalc/tests/test_consumption.py,sha256=CJ9xWtixcJXSpkVxyBrYC1jjQYGQHifsJ8IL1rK7BIk,6318
+taxcalc/tests/test_cpscsv.py,sha256=NvHMxem7jloK59VsIoH3A3pr1pfXam54n7S2JTUxI0U,8410
 taxcalc/tests/test_data.py,sha256=Zwuf23WeaF0N53X0eo3MlnkO2Pn4qqgGNUZPpD8FETc,4461
-taxcalc/tests/test_decorators.py,sha256=F31pt1S7jIgkgV62xMC-poWRzG7fzYVOJes9tOoCF40,10232
-taxcalc/tests/test_growdiff.py,sha256=vXZTgPJTUi25mZrfmTPErytSC69Bs_36ydrQmWxgm9g,3420
+taxcalc/tests/test_decorators.py,sha256=hKM1_X_1U4YOat06UIAfsfbjr0WcDLQhuXhQfjlySr8,10309
+taxcalc/tests/test_growdiff.py,sha256=-xUv33Bnzl5oB-DaIIkOqZ9375ULNCTrWam9LpvDwI8,3420
 taxcalc/tests/test_growfactors.py,sha256=L-DQMR2fh_rOQa3Lx1CDVnB2Q73zXUfTYYVunt0heto,2796
-taxcalc/tests/test_parameters.py,sha256=G5mTb2ZQksVGEv8MoO2Fwt12ZJYzk7_-yGT-A-fhBkM,20420
-taxcalc/tests/test_policy.py,sha256=eFEWbgZ33ga-L9M51M-bhuE7HvlOOvBJ6vv90_aO3mM,54902
-taxcalc/tests/test_puf_var_stats.py,sha256=PaoCmdhpjNMk1_3VaNoMV81-dWNhEChq-UhGlPvHVT8,7786
-taxcalc/tests/test_pufcsv.py,sha256=OdM-KyPBCP8TS6iQgKkUzrA3mWzX_giKi2hipgMW-Gw,14456
-taxcalc/tests/test_records.py,sha256=ncswnbCY7vZgJ_h6xwql4oFw-jZG2gWOMWvEJC2_jdc,8827
-taxcalc/tests/test_reforms.py,sha256=9wvMvCOQwafOBiVVGPU8IjgAD8JU6k58zfgEzF-yobU,16045
+taxcalc/tests/test_parameters.py,sha256=b_Gzy_23M95CdQV1fSr06bW3cXWcnAN-AgcB10EOxhQ,20612
+taxcalc/tests/test_policy.py,sha256=rrJlh408be_cP7v6fa-k6hfiRuVH2FAYvGzxjIZAaUE,54902
+taxcalc/tests/test_puf_var_stats.py,sha256=uZ-UZalpaRKOnaoqUzGo1c7vBnusGkThqTIaVapntvg,7786
+taxcalc/tests/test_pufcsv.py,sha256=iI35JvKnijHFk5hOwa9qQtl0KtSpIyFjjsSUq4vpJ1o,14456
+taxcalc/tests/test_records.py,sha256=gYX6kiI4WuJYYv07hDXL1zRISRnySDR3wT_EMUrR6kI,8975
+taxcalc/tests/test_reforms.py,sha256=HLne537IlqQL_s5dDwkwYBNfurPIs7BhtSJczW0YpBU,15163
 taxcalc/tests/test_responses.py,sha256=2CkVVdaDNCSALMoUcGgweRlS2tfsK3kXogHtDkZMqJU,1663
-taxcalc/tests/test_taxcalcio.py,sha256=4WUqtC9OsTczZqsa5jTaXfOQ5YNJRTotg5I6l9859KA,23821
+taxcalc/tests/test_taxcalcio.py,sha256=_2g5vtPRNSVQeArmsioCoHmOkg_jpQ1gscGNNf0pw7E,24051
 taxcalc/tests/test_utils.py,sha256=hqBVxddwcSP_6dEBccb-FlPMDm68EENzTtFaVVZ8exs,29403
 taxcalc/validation/CSV_INPUT_VARS.md,sha256=MqlZZGt_a1n8JAU-nY5MjnTmjz1pMOuhtpVYIGUgl38,1433
 taxcalc/validation/CSV_OUTPUT_VARS.md,sha256=wr8oyCJDXcxl4Lu0H_wMofUQYhEIyHDif6vkbas1FGE,3000
@@ -131,9 +130,9 @@ taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv,sha256=
 taxcalc/validation/taxsim35/expected_differences/c17-taxdiffs-expect.csv,sha256=YhgojbLowH3yujdYu7SGkdvBZmTgpugu4wYc1Be069M,1125
 taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv,sha256=g9J4BPbTySV-h-RcLvReJq9v1jscgiRSSZzi0taEA-k,1225
 taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv,sha256=Ceh15N_Xr3L7cpYjzGa-8NLCV3obc8PNHEhE5ZxSPhI,1238
-taxcalc-5.2.0.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
-taxcalc-5.2.0.dist-info/METADATA,sha256=rPQS2c0tRcARudzWVjbXrInuFkT3GNjrMOMO7rTSdyQ,3677
-taxcalc-5.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-taxcalc-5.2.0.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
-taxcalc-5.2.0.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
-taxcalc-5.2.0.dist-info/RECORD,,
+taxcalc-5.3.0.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
+taxcalc-5.3.0.dist-info/METADATA,sha256=5WpnBzwPo1bF_W-T27Mchq5aDITFIF1dMNOLhd2cJ54,3509
+taxcalc-5.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+taxcalc-5.3.0.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
+taxcalc-5.3.0.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
+taxcalc-5.3.0.dist-info/RECORD,,

taxcalc/reforms/clp.out.csv

@@ -1,10 +0,0 @@
-RECID,c00100,standard,c04800,iitax,payrolltax
-11,30000.00,12400.00,17600.00,114.50,4590.00
-12,60000.00,12400.00,47600.00,4462.00,9180.00
-13,460000.00,12400.00,447600.00,133795.00,30414.80
-21,60000.00,24800.00,35200.00,-3771.00,9180.00
-22,120000.00,24800.00,95200.00,4924.00,18360.00
-23,240000.00,24800.00,215200.00,35807.00,36720.00
-31,30000.00,18650.00,11350.00,-4543.93,4590.00
-32,60000.00,18650.00,41350.00,880.00,9180.00
-33,120000.00,18650.00,101350.00,13537.00,18360.00