taxcalc 4.6.1__py3-none-any.whl → 4.6.3__py3-none-any.whl

taxcalc/tests/test_policy.py

@@ -12,7 +12,7 @@ import os
 import json
 import numpy as np
 import pytest
-import paramtools as pt
+import paramtools
 from taxcalc.policy import Policy
 
 
@@ -45,21 +45,20 @@ def test_incorrect_class_instantiation():
         Policy(gfactors=[])
 
 
-def test_correct_class_instantiation():
+def test_incorrect_implement_reform_usage():
     """
-    Test correct instantiation of Policy class object.
+    Test for incorrect implement_reform usage.
     """
     pol = Policy()
     assert pol
-    pol.implement_reform({})
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         pol.implement_reform([])
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         pol.implement_reform({2099: {'II_em': 99000}})
     pol.set_year(2019)
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         pol.implement_reform({2018: {'II_em': 99000}})
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         pol.implement_reform({2020: {'II_em': -1000}})
 
 
@@ -142,7 +141,7 @@ REFORM_JSON = """
 """
 
 
-# pylint: disable=protected-access,no-member
+# pylint: disable=protected-access
 
 
 @pytest.mark.parametrize("set_year", [False, True])
@@ -156,7 +155,6 @@ def test_read_json_reform_file_and_implement_reform(set_year):
         pol.set_year(2015)
     pol.implement_reform(Policy.read_json_reform(REFORM_JSON))
     syr = pol.start_year
-    # pylint: disable=protected-access
     amt_brk1 = pol._AMT_brk1
     assert amt_brk1[2015 - syr] == 200000
     assert amt_brk1[2016 - syr] > 200000
@@ -414,7 +412,7 @@ def test_implement_reform_raises_on_no_year():
     """
     reform = {'STD_Aged': [1400, 1200, 1400, 1400, 1400]}
     ppo = Policy()
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         ppo.implement_reform(reform)
 
 
@@ -424,7 +422,7 @@ def test_implement_reform_raises_on_early_year():
     """
     ppo = Policy()
     reform = {'STD_Aged': {2010: [1400, 1100, 1100, 1400, 1400]}}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         ppo.implement_reform(reform)
 
 
@@ -811,37 +809,24 @@ def test_get_index_rate():
     assert pol.wage_growth_rates() == pol._wage_growth_rates
 
 
-def test_reform_with_bad_ctc_levels():
-    """
-    Implement a reform with _ACTC > _CTC_c values.
-    """
-    pol = Policy()
-    child_credit_reform = {
-        'CTC_c': {2020: 2200},
-        'ACTC_c': {2020: 2500}
-    }
-    with pytest.raises(pt.ValidationError):
-        pol.implement_reform(child_credit_reform)
-
-
 def test_reform_with_removed_parameter(monkeypatch):
     """
     Try to use removed parameter in a reform.
     """
     policy1 = Policy()
     reform1 = {'FilerCredit_c': {2020: 1000}}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         policy1.implement_reform(reform1)
     policy2 = Policy()
     reform2 = {'FilerCredit_c-indexed': {2020: True}}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         policy2.implement_reform(reform2)
 
     redefined_msg = {"some_redefined": "some_redefined was redefined."}
     monkeypatch.setattr(Policy, "REDEFINED_PARAMS", redefined_msg)
 
     pol = Policy()
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         pol.implement_reform({"some_redefined": "hello world"})
 
 
@@ -884,28 +869,28 @@ def test_reform_with_scalar_vector_errors():
     """
     policy1 = Policy()
     reform1 = {'SS_thd85': {2020: 30000}}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         policy1.implement_reform(reform1)
 
     policy2 = Policy()
     reform2 = {'ID_Medical_frt': {2020: [0.08]}}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         policy2.implement_reform(reform2)
 
     policy3 = Policy()
     reform3 = {'ID_Medical_frt': [{"year": 2020, "value": [0.08]}]}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         policy3.adjust(reform3)
 
     # Check that error is thrown if there are extra elements in array.
     policy4 = Policy()
     ref4 = {"II_brk1": {2020: [9700, 19400, 9700, 13850, 19400, 19400]}}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         policy4.implement_reform(ref4)
 
     policy5 = Policy()
     ref5 = {"II_rt1": {2029: [.2, .3]}}
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         policy5.implement_reform(ref5)
 
 
@@ -1416,10 +1401,7 @@ def test_multiple_cpi_swaps2():
     )
 
 
-# pylint: disable=invalid-name
-
-
-def test_adj_CPI_offset_and_index_status():
+def test_adj_cpi_offset_and_index_status():
     """
     Test changing parameter_indexing_CPI_offset and another
     parameter simultaneously.
@@ -1491,10 +1473,10 @@ def test_adj_related_parameters_and_index_status():
     )
     assert res.isel[0]["value"] == [445400]
 
-    II_brk7 = pol.to_array("II_brk7", year=[2021, 2022])
-    II_brk7_single = II_brk7[:, 0]
+    ii_brk7 = pol.to_array("II_brk7", year=[2021, 2022])
+    ii_brk7_single = ii_brk7[:, 0]
     np.testing.assert_equal(
-        (II_brk7_single[1] / II_brk7_single[0] - 1).round(4),
+        (ii_brk7_single[1] / ii_brk7_single[0] - 1).round(4),
         pol.inflation_rates(year=2021),
     )
 
@@ -1509,7 +1491,7 @@ def test_indexed_status_parsing():
     pol2.adjust({"EITC_c-indexed": False})
     cmp_policy_objs(pol1, pol2)
 
-    with pytest.raises(pt.ValidationError):
+    with pytest.raises(paramtools.ValidationError):
         pol2.adjust({"EITC_c-indexed": 123})
 
 
@@ -1557,3 +1539,133 @@ def test_two_sets_of_tax_brackets():
                 emsg += f'  PT_brk{bnum} is {pt_val}\n'
     if emsg:
         raise ValueError(emsg)
+
+
+def test_ext_plus_ctc1_reform(tests_path):
+    """
+    Test ext.json plus ctc1 compound reform relative to ext.json baseline.
+    """
+    # specify baseline policy, bas, as the extend-TCJA reform
+    bas = Policy()
+    filename = os.path.join(tests_path, '..', 'reforms', 'ext.json')
+    with open(filename, 'r', encoding='utf-8') as rfile:
+        ext_text = rfile.read()
+    bas.implement_reform(Policy.read_json_reform(ext_text))
+    assert not bas.parameter_errors
+    # specify reform policy, ref, as extend-TCJA plus liberalization of CTC
+    ref = Policy()
+    ref.implement_reform(Policy.read_json_reform(ext_text))
+    ctc1_reform = {
+        # one possible child-tax-credit revision to the extend-TCJA reform
+        'CTC_c': {
+            2026: 2500.00,
+            2027: 2500.00,
+            2028: 2500.00,
+            2029: 2000.00,
+        },
+        'CTC_c-indexed': {2029: True},
+    }
+    ref.implement_reform(ctc1_reform)
+    assert not ref.parameter_errors
+    # check bas and ref parameter values against expected parameter values
+    exp_ctc_c_bas = {
+        2025: 2000,
+        2026: 2000,
+        2027: 2000,
+        2028: 2000,
+        2029: 2000,
+        2030: 2000,
+    }
+    exp_ctc_c_ref = {
+        2025: 2000,
+        2026: 2500,
+        2027: 2500,
+        2028: 2500,
+        2029: 2000,
+        2030: 2044.80,
+    }
+    exp_actc_c = {
+        2025: 1700,
+        2026: 1776.67,
+        2027: 1819.84,
+        2028: 1861.88,
+        2029: 1903.96,
+        2030: 1946.61,
+    }
+    for year in range(2025, 2031):
+        bas.set_year(year)
+        assert np.allclose([bas.CTC_c], [exp_ctc_c_bas[year]])
+        assert np.allclose([bas.ACTC_c], [exp_actc_c[year]])
+        ref.set_year(year)
+        assert np.allclose([ref.CTC_c], [exp_ctc_c_ref[year]])
+        assert np.allclose([ref.ACTC_c], [exp_actc_c[year]])
+
+
+def test_ext_plus_ctc2_reform(tests_path):
+    """
+    Test ext.json plus ctc2 compound reform relative to ext.json baseline.
+    """
+    # specify baseline policy, bas, as the extend-TCJA reform
+    bas = Policy()
+    filename = os.path.join(tests_path, '..', 'reforms', 'ext.json')
+    with open(filename, 'r', encoding='utf-8') as rfile:
+        ext_text = rfile.read()
+    bas.implement_reform(Policy.read_json_reform(ext_text))
+    assert not bas.parameter_errors
+    # specify reform policy, ref, as extend-TCJA plus liberalization of CTC
+    ref = Policy()
+    ref.implement_reform(Policy.read_json_reform(ext_text))
+    ctc2_reform = {
+        # one possible child-tax-credit revision to the extend-TCJA reform
+        'CTC_c': {
+            2026: 2500.00,
+            2027: 2500.00,
+            2028: 2500.00,
+            2029: 2000.00,
+        },
+        'CTC_c-indexed': {2029: True},
+        'ACTC_c': {2029: 1750},
+        'ACTC_c-indexed': {2029: False},
+    }
+    ref.implement_reform(ctc2_reform)
+    assert not ref.parameter_errors
+    # check bas and ref parameter values against expected parameter values
+    exp_ctc_c_bas = {
+        2025: 2000,
+        2026: 2000,
+        2027: 2000,
+        2028: 2000,
+        2029: 2000,
+        2030: 2000,
+    }
+    exp_ctc_c_ref = {
+        2025: 2000,
+        2026: 2500,
+        2027: 2500,
+        2028: 2500,
+        2029: 2000,
+        2030: 2044.80,
+    }
+    exp_actc_c_bas = {
+        2025: 1700,
+        2026: 1776.67,
+        2027: 1819.84,
+        2028: 1861.88,
+        2029: 1903.96,
+        2030: 1946.61,
+    }
+    exp_actc_c_ref = {
+        2025: 1700,
+        2026: 1776.67,
+        2027: 1819.84,
+        2028: 1861.88,
+        2029: 1750,
+        2030: 1750,
+    }
+    for year in range(2025, 2031):
+        bas.set_year(year)
+        assert np.allclose([bas.CTC_c], [exp_ctc_c_bas[year]])
+        assert np.allclose([bas.ACTC_c], [exp_actc_c_bas[year]])
+        ref.set_year(year)
+        assert np.allclose([ref.CTC_c], [exp_ctc_c_ref[year]])
+        assert np.allclose([ref.ACTC_c], [exp_actc_c_ref[year]])

taxcalc/tests/test_reforms.py

@@ -338,7 +338,7 @@ def fixture_reforms_dict(tests_path):
     return json.loads(rjson)
 
 
-NUM_REFORMS = 64  # when changing this also change num_reforms in conftest.py
+NUM_REFORMS = 63  # when changing this also change num_reforms in conftest.py
 
 
 @pytest.mark.requires_pufcsv
@@ -386,4 +386,4 @@ def test_ext_reform(tests_path):
     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], [-205.769], rtol=0.0, atol=0.01)
+    assert np.allclose([weighted_sum_rdiff], [-214.393], rtol=0.0, atol=0.01)

taxcalc/tests/test_taxcalcio.py

@@ -153,6 +153,24 @@ def fixture_errorreformfile():
             pass  # sometimes we can't remove a generated temporary file
 
 
+@pytest.fixture(scope='session', name='ereformfile')
+def fixture_ereformfile():
+    """
+    Temporary reform file with .json extension.
+    """
+    contents = '{"II_em": {"2022": 1000},}'
+    with tempfile.NamedTemporaryFile(
+            suffix='.json', mode='a', delete=False
+    ) as rfile:
+        rfile.write(contents)
+    yield rfile
+    if os.path.isfile(rfile.name):
+        try:
+            os.remove(rfile.name)
+        except OSError:
+            pass  # sometimes we can't remove a generated temporary file
+
+
 @pytest.fixture(scope='session', name='errorassumpfile')
 def fixture_errorassumpfile():
     """
@@ -249,6 +267,7 @@ def fixture_assumpfile2():
      'no-dot-json-filename'),
     ([], [], [], [],),
     ('no-exist.csv', 'no-exist.json', 'no-exist.json', 'no-exist.json'),
+    ('cps.csv', 'ereformfile', 'ereformfile', 'no-exist.json'),
 ])
 def test_ctor_errors(input_data, baseline, reform, assump):
     """
@@ -351,16 +370,19 @@ def test_ctor_init_with_cps_files():
     """
     # specify valid tax_year for cps.csv input data
     txyr = 2020
-    tcio = TaxCalcIO('cps.csv', txyr, None, None, None)
-    tcio.init('cps.csv', txyr, None, None, None,
-              aging_input_data=True,
-              exact_calculations=False)
-    assert not tcio.errmsg
-    assert tcio.tax_year() == txyr
-    # test advance_to_year method
-    tcio.silent = False
-    tcio.advance_to_year(txyr + 1, True)
-    assert tcio.tax_year() == txyr + 1
+    for rid in [0, 99]:
+        tcio = TaxCalcIO('cps.csv', txyr, None, None, None, runid=rid)
+        tcio.init(
+            'cps.csv', txyr, None, None, None,
+            aging_input_data=True,
+            exact_calculations=False,
+        )
+        assert not tcio.errmsg
+        assert tcio.tax_year() == txyr
+        # test advance_to_year method
+        tcio.silent = False
+        tcio.advance_to_year(txyr + 1, True)
+        assert tcio.tax_year() == txyr + 1
     # specify invalid tax_year for cps.csv input data
     txyr = 2013
     tcio = TaxCalcIO('cps.csv', txyr, None, None, None)
@@ -426,7 +448,7 @@ def test_output_options_min(reformfile1, assumpfile1):
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    dumppath = tcio.output_filepath().replace('.xxx', '.db')
+    dumppath = tcio.output_filepath().replace('.xxx', '.dumpdb')
     # minimal dump output
     dumpvars = TaxCalcIO.MINIMAL_DUMPVARS
     try:
@@ -461,7 +483,7 @@ def test_output_options_mtr(reformfile1, assumpfile1):
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    dumppath = tcio.output_filepath().replace('.xxx', '.db')
+    dumppath = tcio.output_filepath().replace('.xxx', '.dumpdb')
     # minimal+mtr_* dump output
     dumpvars = TaxCalcIO.MINIMAL_DUMPVARS
     for var in TaxCalcIO.MTR_DUMPVARS:
@@ -503,7 +525,7 @@ def test_write_policy_param_files(reformfile1):
     assert not tcio.errmsg
     tcio.write_policy_params_files()
     outfilepath = tcio.output_filepath()
-    for ext in ['-params.bas', '-params.ref']:
+    for ext in ['-params.baseline', '-params.reform']:
         filepath = outfilepath.replace('.xxx', ext)
         if os.path.isfile(filepath):
             os.remove(filepath)

taxcalc/utils.py

@@ -8,6 +8,7 @@ PUBLIC low-level utility functions for Tax-Calculator.
 # pylint: disable=too-many-lines
 
 import os
+import re
 import math
 import json
 import copy
@@ -930,8 +931,8 @@ def mtr_graph_data(vdf, year,
     ).values[:, 1]
     # construct DataFrame containing the two mtr?_series
     lines = pd.DataFrame()
-    lines['base'] = mtr1_series
-    lines['reform'] = mtr2_series
+    lines['base'] = np.round(mtr1_series, decimals=4)
+    lines['reform'] = np.round(mtr2_series, decimals=4)
     # construct dictionary containing merged data and auto-generated labels
     data = {}
     data['lines'] = lines
@@ -1064,8 +1065,8 @@ def atr_graph_data(vdf, year,
         where=avginc_series[included] != 0)
     # construct DataFrame containing the two atr?_series
     lines = pd.DataFrame()
-    lines['base'] = atr1_series
-    lines['reform'] = atr2_series
+    lines['base'] = np.round(atr1_series, decimals=4)
+    lines['reform'] = np.round(atr2_series, decimals=4)
     # include only percentiles with average income no less than min_avginc
     lines = lines[included]
     # construct dictionary containing plot lines and auto-generated labels
@@ -1236,7 +1237,7 @@ def pch_graph_data(vdf, year, pop_quantiles=False):
         where=avginc_series[included] != 0)
     # construct DataFrame containing the pch_series expressed as percent
     line = pd.DataFrame()
-    line['pch'] = pch_series * 100
+    line['pch'] = np.round(pch_series * 100, decimals=2)
     # include only percentiles with average income no less than min_avginc
     line = line[included]
     # construct dictionary containing plot line and auto-generated labels
@@ -1574,25 +1575,45 @@ def bootstrap_se_ci(data, seed, num_samples, statistic, alpha):
     return bsest
 
 
-def json_to_dict(json_text):
+def json_to_dict(jsontext):
     """
     Convert specified JSON text into an ordered Python dictionary.
 
     Parameters
     ----------
-    json_text: string
-        JSON text.
+    jsontext: string
+        JSON text that may contain comments, which will be removed
 
     Raises
     ------
     ValueError:
-        if json_text contains a JSON syntax error.
+        if jsontext contains a JSON syntax error after comments are removed
 
     Returns
     -------
     dictionary: collections.OrderedDict
-        JSON data expressed as an ordered Python dictionary.
+        JSON data expressed as an ordered Python dictionary
     """
+    def remove_comments(string):
+        """
+        Remove single and multiline comments from JSON.
+        Logic follows https://stackoverflow.com/a/18381470/9100772
+        """
+        def _replacer(match):
+            # 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
+            # otherwise, we will return the 1st group
+            return match.group(1)  # captured quoted-string
+        # begin main remove_comments function logic
+        pattern = r"(\".*?\"|\'.*?\')|(/\*.*?\*/|//[^\r\n]*$)"
+        # first group captures quoted strings (double or single)
+        # second group captures comments (//single-line or /* multi-line */)
+        regex = re.compile(pattern, re.MULTILINE | re.DOTALL)
+        return regex.sub(_replacer, string)
+    # begin main json_to_dict function logic
+    json_text = remove_comments(jsontext)
     try:
         ordered_dict = json.loads(json_text,
                                   object_pairs_hook=collections.OrderedDict)
@@ -1610,5 +1631,6 @@ def json_to_dict(json_text):
             linenum += 1
             msg += f'{linenum:04d}{line}\n'
         msg += bline + '\n'
+        msg += 'If still puzzled, try using JSONLint online.\n'
         raise ValueError(msg) from valerr
     return ordered_dict

{taxcalc-4.6.1.dist-info → taxcalc-4.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxcalc
-Version: 4.6.1
+Version: 4.6.3
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -22,7 +22,7 @@ Requires-Dist: numpy>=1.26
 Requires-Dist: pandas>=2.2
 Requires-Dist: bokeh>=2.4
 Requires-Dist: numba
-Requires-Dist: paramtools>=0.19.0
+Requires-Dist: paramtools>=0.20.0
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
@@ -57,3 +57,6 @@ 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-4.6.1.dist-info → taxcalc-4.6.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
-taxcalc/__init__.py,sha256=_SNXt6U2NMWDx1hqcUw-N6_SVHp4pydp4-U1VFEPldY,536
-taxcalc/calcfunctions.py,sha256=G62sQeW-YHJ2gvqOfidRKPBpufSHzXYIdI2PGcApOuU,148423
+taxcalc/__init__.py,sha256=9Esf49oClu0DBglso6q08J0YbCTnWQRRvM6TpVKX5ZE,536
+taxcalc/calcfunctions.py,sha256=Rt2BN7rI9Hr86jSqGN7-HeqqXGlh1PN0wUGuivwbjos,148442
 taxcalc/calculator.py,sha256=cCsis9yQSyw4eXvYppk7Z70JEaPH8Kd1AADlIqnJhVw,63930
 taxcalc/conftest.py,sha256=nO4J7qu1sTHgjqrzhpRMvfMJUrNm6GP_IsSuuDt_MeQ,141
 taxcalc/consumption.json,sha256=FBgDd72AZnviQRhGz5rPgpGpOmaOzNYfGB9GdTCeKPI,8102
@@ -12,21 +12,21 @@ taxcalc/growdiff.json,sha256=ReBAF6We9ZwTb0uDYQwbedPsQKdm6KSOERiddEYZbm0,15037
 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/parameters.py,sha256=pxW53fOJkW7yM7XxN04RDNs-f7CwKOjE4vMmMvPtZ8E,33121
-taxcalc/policy.py,sha256=4bY3beSYhLKk_X4CTgG7LGnVnILM0D4Invt7uCp8dlA,6725
-taxcalc/policy_current_law.json,sha256=enemNPLg0ZlwNQVVK51XJru_YzDzPnV7ClNhdJHlhJQ,689915
+taxcalc/parameters.py,sha256=VmezOOynj1W7hexnDgCzlyffIxHpFK6eSd6zNzn3aAk,36161
+taxcalc/policy.py,sha256=FpzxNSAYmcu6ScWZwxta3reOSQL9aQyRhAqv-bf28_E,7581
+taxcalc/policy_current_law.json,sha256=4NVEbt3Zv55s_i4GksIvKxSMrrWiPs2I74t1LVMcCE0,689913
 taxcalc/puf_ratios.csv,sha256=USMM79UEX8PnSKY_LYLxvACER_9NHyj4ipNEk2iyykQ,3580
 taxcalc/puf_weights.csv.gz,sha256=35iZhzFO0dHUI2zf4_liyk60E-3Sgr_AbxszGxw7LfM,13522484
 taxcalc/records.py,sha256=K5QgP6Pm9PtEVDVzM7tpHYPu554Wio0KnrU7YTTBKgQ,18264
 taxcalc/records_variables.json,sha256=_YKJiZQ1czp0VH9bkr5ZXmp9Mm1roHoHrt2XnLXAtfw,42975
-taxcalc/taxcalcio.py,sha256=1xZ17wZ0yqZeDDa5glEQpCG6xvXJ4wGxbUQPkmTLTD0,34752
-taxcalc/utils.py,sha256=noHnQ-tw0AXhEH-OgdTUiPedH8luVOJ5NdfpKI3_obw,62401
+taxcalc/taxcalcio.py,sha256=_ylnC-dZUpDFn79F8pjkZEq-wJhPCQA7Ig9SRLyhrUA,37691
+taxcalc/utils.py,sha256=Wsvni2UP7WgnByN4bRIiLGgamDFwfQoexiy420o6ewY,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=StZo-46v1c3ozP-64wQWz0uyHOEVqZPAzgTr1JuoFjU,16614
+taxcalc/cli/tc.py,sha256=hGkP-XHkvx0MoFdHf-BjUnKqAxQBRtk8Vv4uqtIGuRY,18760
 taxcalc/reforms/2017_law.json,sha256=u-xaPSvt5ubfZw1Nb-jNhTNcOPBUJeAX2kJVoEyMgC4,5860
 taxcalc/reforms/2017_law.out.csv,sha256=nnNKXqY2kof8HC1nnU8srPsvNNepi6ISXQ9OJpQnT7M,473
 taxcalc/reforms/ARPA.json,sha256=1H9LuJ_QitXRO9e8R3PWizajJgdioIzbGFdvdlt9FVg,3119
@@ -40,7 +40,7 @@ taxcalc/reforms/ConsolidatedAppropriationsAct2021.out.csv,sha256=qSUdI0LoQFGG6h2
 taxcalc/reforms/Larson2019.json,sha256=bpfcrtwJO2tNKAG4ITXedCUggbkxXNuwxyrZ456KA-U,1662
 taxcalc/reforms/Larson2019.out.csv,sha256=s9kVoVYOrznFx4bGiDewyHWRKf7-wgXqpMIMTyxC1zA,475
 taxcalc/reforms/README.md,sha256=0Ua4RBUnLKcEwxHqncRFDg7QMNq1oblXVNeyYRYfae4,1193
-taxcalc/reforms/REFORMS.md,sha256=BTXM9vSz0p0Mi9QHdDrngbdQfIbdYPg9u8UE2PtErvk,3658
+taxcalc/reforms/REFORMS.md,sha256=ewozCNudZfuL89FABQHOSxVn4DJ72hAQ2ghjE3s9kN4,3604
 taxcalc/reforms/Renacci.json,sha256=U6rmbe1-IANG_H69xET5G8-v76ErbbHcm1JdRzAO8y4,2437
 taxcalc/reforms/Renacci.out.csv,sha256=dBrDH-Sc5EYvsYzotJZShRxd1EbhdI3enOUqaAsAyuI,472
 taxcalc/reforms/SandersDeFazio.json,sha256=BMSfl96ERD4SGd_PDMQkiDV5s4iD7Mh1BjS7uKxVD18,710
@@ -54,7 +54,7 @@ taxcalc/reforms/Trump2017.json,sha256=DZjCJQZYe98Skyss7z_Jhj8HJld_FPZeQGxwzGgQIn
 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=578ckWd4bTbH_XnTR-smMKtE7Auu9seGn7de_hsGIos,3130
+taxcalc/reforms/ext.json,sha256=-IfEpGAAIOiQMp-fW1F1W5OMiuUgdXAnr0mUa364Dok,3058
 taxcalc/reforms/growfactors_ext.csv,sha256=E0szWXtgV5jcpiyvREOz1yXw_poPIBC77bBQI1rlFxM,17733
 taxcalc/reforms/ptaxes0.json,sha256=QkvqCVkI23sF7FvTHqaUYNpEJYuHNChbKwH0mH7Otp4,1718
 taxcalc/reforms/ptaxes0.out.csv,sha256=DKGsyNWqo-ABUnjFjEGMpqqhmT2WDRGuU6sKTgH_obc,476
@@ -75,15 +75,15 @@ 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=xBoh0jQwe2_jbjLhuHHwtSmVPBSr2UkbJ7rOmc9FDxk,5164
+taxcalc/tests/conftest.py,sha256=ySPrNaC3m8a7Jp4SaAkq2P4iNTVLCj7b8lqIfpTMxYY,5164
 taxcalc/tests/cpscsv_agg_expect.csv,sha256=Do3gRVVKUCZtQ2Ooy5jn6gMS9_WbclJ5FhSSHR6gwX8,2089
 taxcalc/tests/puf_var_correl_coeffs_2016.csv,sha256=2VtWUcTaE6c5cmmEDylv9XKVONLT6GZ10gozELxk-2g,57314
 taxcalc/tests/puf_var_wght_means_by_year.csv,sha256=nou_pIKICyXmCfyj_UziNXp1EB4BQU7Qa-ZvqlE1WqM,20049
 taxcalc/tests/pufcsv_agg_expect.csv,sha256=h0r6MtsFEBa1u5zwpRT4fDx2T__ZAkdx4oeLxidQI4s,2117
 taxcalc/tests/pufcsv_mtr_expect.txt,sha256=xGsUfafzsZ04fFQw162ys-1Mf1CDC_PQ0QZNigS07VY,4265
-taxcalc/tests/reforms.json,sha256=vGJrvfKJ7h5iAWF-vV9NmY8Z9HP_iereiYiYNcfhBMo,19212
-taxcalc/tests/reforms_expect.csv,sha256=6m0bSH8S6ReMYdHoQC9iWYuJAof5sZ0OONVBi7zX8JE,1464
-taxcalc/tests/test_4package.py,sha256=I9i5rWFsg-VCtTLmUWIi9dnusieTZeodrgH8ba_Fbng,3681
+taxcalc/tests/reforms.json,sha256=udnp9vPmTQpQQ39LaYqGUWJrwEZnYGPiEdyVkWklp3c,18835
+taxcalc/tests/reforms_expect.csv,sha256=FlyccVCTgnRSL8CNdNT5-m6_Vx88J935OEjA4PzTqxg,1440
+taxcalc/tests/test_4package.py,sha256=1qhmDS3bdfNHNgz4pggaE6LduT3KKUtOsdtqP3QSIYQ,3601
 taxcalc/tests/test_benefits.py,sha256=oaui5mO0TuW8Ht-uxvUCBL5zM3iTENq3Whyf_gEpY1U,3392
 taxcalc/tests/test_calcfunctions.py,sha256=QtMgQg_WpCU8PZM3Hs8Pml4q6LnlLWV_blCzbpGN2sw,31939
 taxcalc/tests/test_calculator.py,sha256=lcnBli5giNFxqgCLW-MF4J_wsV3gSFqCjzJdCJkihek,36085
@@ -95,14 +95,14 @@ taxcalc/tests/test_data.py,sha256=Zwuf23WeaF0N53X0eo3MlnkO2Pn4qqgGNUZPpD8FETc,44
 taxcalc/tests/test_decorators.py,sha256=F31pt1S7jIgkgV62xMC-poWRzG7fzYVOJes9tOoCF40,10232
 taxcalc/tests/test_growdiff.py,sha256=vXZTgPJTUi25mZrfmTPErytSC69Bs_36ydrQmWxgm9g,3420
 taxcalc/tests/test_growfactors.py,sha256=L-DQMR2fh_rOQa3Lx1CDVnB2Q73zXUfTYYVunt0heto,2796
-taxcalc/tests/test_parameters.py,sha256=aOUC2bHZqzaolHT2GDV52jEhsNcyYLxE9igTrJ4horI,20341
-taxcalc/tests/test_policy.py,sha256=hJrFqqptMoUWk3abIJ2sdADQtCqvGaUeW5as1aNwhR8,52916
+taxcalc/tests/test_parameters.py,sha256=uVr7C_uKDJ5guOqYOa_yhtCxGAVM5RSSxyIZhINotoA,20000
+taxcalc/tests/test_policy.py,sha256=dTrdJin2G2SKMShb1aOM5S7vDtQ6uxM3BxiQURfs54k,56540
 taxcalc/tests/test_puf_var_stats.py,sha256=TG-sQtOkR6cBOw0am7MUsMSwjPxVdkvt0Xov342oii8,7786
 taxcalc/tests/test_pufcsv.py,sha256=kQPwpMcLNPwQDiO-23xvvZggtHYvRz-UYEDn6JjNfbw,16352
 taxcalc/tests/test_records.py,sha256=ncswnbCY7vZgJ_h6xwql4oFw-jZG2gWOMWvEJC2_jdc,8827
-taxcalc/tests/test_reforms.py,sha256=djVxMOE2RytmDDYvzS55AnThRRBcVc_calPbfHuvQ-k,16033
+taxcalc/tests/test_reforms.py,sha256=3vDRnkQrQaRVl5qXEtCxz-nM_y-K2T6e2O-ilx0nZ6o,16033
 taxcalc/tests/test_responses.py,sha256=2CkVVdaDNCSALMoUcGgweRlS2tfsK3kXogHtDkZMqJU,1663
-taxcalc/tests/test_taxcalcio.py,sha256=PV7hCntwp_1LHQYlft7WelbzKSoi5aWzUZqhJAcC5AE,23135
+taxcalc/tests/test_taxcalcio.py,sha256=4WUqtC9OsTczZqsa5jTaXfOQ5YNJRTotg5I6l9859KA,23821
 taxcalc/tests/test_utils.py,sha256=aUHVNxfSMdyyLAz3w98KLQa5D872rZxXqKbPkIqwLLA,29403
 taxcalc/validation/CSV_INPUT_VARS.md,sha256=MqlZZGt_a1n8JAU-nY5MjnTmjz1pMOuhtpVYIGUgl38,1433
 taxcalc/validation/CSV_OUTPUT_VARS.md,sha256=wr8oyCJDXcxl4Lu0H_wMofUQYhEIyHDif6vkbas1FGE,3000
@@ -131,9 +131,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-4.6.1.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
-taxcalc-4.6.1.dist-info/METADATA,sha256=wvnDftJBQ7SKgJAF-hCYRKf_RJX3RNSPj2LLe-nL59s,3509
-taxcalc-4.6.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-taxcalc-4.6.1.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
-taxcalc-4.6.1.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
-taxcalc-4.6.1.dist-info/RECORD,,
+taxcalc-4.6.3.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
+taxcalc-4.6.3.dist-info/METADATA,sha256=blEI-Z0ZGiWJHdI9xf4Hlw7h8PNNq37NChbPQr6PWcY,3677
+taxcalc-4.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+taxcalc-4.6.3.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
+taxcalc-4.6.3.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
+taxcalc-4.6.3.dist-info/RECORD,,

{taxcalc-4.6.1.dist-info → taxcalc-4.6.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any