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

taxcalc/tests/test_4package.py

@@ -68,6 +68,7 @@ def test_for_consistency(tests_path):
         'coverage',
         "pip",
         "jupyter-book",
+        "marshmallow>=3.22, <4.0",  # TODO: drop this after ParamTools is fixed
         "setuptools"
     ])
     # read conda.recipe/meta.yaml requirements

taxcalc/tests/test_calculator.py

@@ -69,7 +69,7 @@ def test_make_calculator_with_policy_reform(cps_subsample):
     pol.implement_reform(reform)
     # create a Calculator object using this policy reform
     calc = Calculator(policy=pol, records=rec)
-    assert calc.reform_warnings == {}
+    assert calc.reform_errors == {}
     # check that Policy object embedded in Calculator object is correct
     assert calc.current_year == year
     assert calc.policy_param('II_em') == 4000
@@ -808,10 +808,10 @@ def test_itemded_component_amounts(year, cvname, hcname, puf_fullsample):
     policy2.implement_reform(reform2)
     assert not policy2.parameter_errors
     # compute tax liability in specified year
-    calc1 = Calculator(policy=policy1, records=recs, verbose=False)
+    calc1 = Calculator(policy=policy1, records=recs, verbose=True)
     calc1.advance_to_year(year)
     calc1.calc_all()
-    calc2 = Calculator(policy=policy2, records=recs, verbose=False)
+    calc2 = Calculator(policy=policy2, records=recs, verbose=True)
     calc2.advance_to_year(year)
     calc2.calc_all()
     # confirm that nobody is taking the standard deduction

taxcalc/tests/test_reforms.py

@@ -28,7 +28,7 @@ def test_2017_law_reform(tests_path):
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not pol.parameter_warnings
+    assert not pol.parameter_errors
     pol.set_year(2018)
     pre_mdata = dict(pol.items())
     # check some policy parameter values against expected values under 2017 law
@@ -102,14 +102,14 @@ def test_round_trip_reforms(fyear, tests_path):
     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_warnings
+    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_warnings
+    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')
@@ -123,21 +123,21 @@ def test_round_trip_reforms(fyear, tests_path):
     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_warnings
+    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_warnings
+    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_warnings
+    assert not rtr_pol.parameter_errors
     assert not rtr_pol.errors
     rtr_pol.set_year(fyear)
     rtr_mdata = dict(rtr_pol.items())
@@ -371,7 +371,7 @@ def test_ext_reform(tests_path):
     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_warnings
+    assert not ext.parameter_errors
     ext.set_year(2026)
     assert ext.II_em < end.II_em
     # test tax output generated by ext.json reform file using public CPS data
@@ -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], [-214.11], rtol=0.0, atol=0.01)
+    assert np.allclose([weighted_sum_rdiff], [-205.769], rtol=0.0, atol=0.01)

taxcalc/tests/test_taxcalcio.py

@@ -243,20 +243,19 @@ def fixture_assumpfile2():
             pass  # sometimes we can't remove a generated temporary file
 
 
-@pytest.mark.parametrize('input_data, baseline, reform, assump, outdir', [
+@pytest.mark.parametrize('input_data, baseline, reform, assump', [
     ('no-dot-csv-filename', 'no-dot-json-filename',
      'no-dot-json-filename',
-     'no-dot-json-filename', 'no-output-directory'),
-    ([], [], [], [], []),
-    ('no-exist.csv', 'no-exist.json', 'no-exist.json', 'no-exist.json', '.'),
+     'no-dot-json-filename'),
+    ([], [], [], [],),
+    ('no-exist.csv', 'no-exist.json', 'no-exist.json', 'no-exist.json'),
 ])
-def test_ctor_errors(input_data, baseline, reform, assump, outdir):
+def test_ctor_errors(input_data, baseline, reform, assump):
     """
     Ensure error messages are generated by TaxCalcIO.__init__.
     """
     tcio = TaxCalcIO(input_data=input_data, tax_year=2013,
-                     baseline=baseline, reform=reform, assump=assump,
-                     outdir=outdir)
+                     baseline=baseline, reform=reform, assump=assump)
     assert tcio.errmsg
 
 
@@ -316,7 +315,8 @@ def test_creation_with_aging(reformfile0):
                      tax_year=taxyear,
                      baseline=None,
                      reform=reformfile0.name,
-                     assump=None)
+                     assump=None,
+                     silent=False)
     assert not tcio.errmsg
     tcio.init(input_data=pd.read_csv(StringIO(RAWINPUT)),
               tax_year=taxyear,
@@ -357,6 +357,10 @@ def test_ctor_init_with_cps_files():
               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)
@@ -371,18 +375,18 @@ def test_ctor_init_with_cps_files():
     MARS;iitax	payrolltax|combined,
     c00100
     surtax
-    """, True, 8),  # these 6 parameters plus added RECID and FLPDYR
+    """, True, 6),  # these 6 parameters minus MARS plus RECID
 
     ("""
     MARS;iitax	payrolltax|kombined,c00100
     surtax
     RECID
     FLPDYR
-    """, False, 8)
+    """, False, 0)
 ])
-def test_custom_dump_variables(dumpvar_str, str_valid, num_vars):
+def test_dump_variables(dumpvar_str, str_valid, num_vars):
     """
-    Test TaxCalcIO custom_dump_variables method.
+    Test TaxCalcIO dump_variables method.
     """
     recdict = {'RECID': 1, 'MARS': 1, 'e00300': 100000, 's006': 1e8}
     recdf = pd.DataFrame(data=recdict, index=[0])
@@ -395,17 +399,17 @@ def test_custom_dump_variables(dumpvar_str, str_valid, num_vars):
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    varset = tcio.custom_dump_variables(dumpvar_str)
-    assert isinstance(varset, set)
+    varlist = tcio.dump_variables(dumpvar_str)
+    assert isinstance(varlist, list)
     valid = len(tcio.errmsg) == 0
     assert valid == str_valid
     if valid:
-        assert len(varset) == num_vars
+        assert len(varlist) == num_vars
 
 
-def test_output_options(reformfile1, assumpfile1):
+def test_output_options_min(reformfile1, assumpfile1):
     """
-    Test TaxCalcIO output_dump options when writing_output_file.
+    Test TaxCalcIO output_dump options with minimal dump variables.
     """
     taxyear = 2021
     tcio = TaxCalcIO(input_data=pd.read_csv(StringIO(RAWINPUT)),
@@ -422,114 +426,93 @@ def test_output_options(reformfile1, assumpfile1):
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    outfilepath = tcio.output_filepath()
-    # minimal output with no --dump option
-    try:
-        tcio.analyze(writing_output_file=True, output_dump=False)
-    except Exception:  # pylint: disable=broad-except
-        if os.path.isfile(outfilepath):
-            try:
-                os.remove(outfilepath)
-            except OSError:
-                pass  # sometimes we can't remove a generated temporary file
-        assert False, 'TaxCalcIO.analyze(minimal_output) failed'
-    # --dump output with full dump
-    try:
-        tcio.analyze(writing_output_file=True, output_dump=True)
-    except Exception:  # pylint: disable=broad-except
-        if os.path.isfile(outfilepath):
-            try:
-                os.remove(outfilepath)
-            except OSError:
-                pass  # sometimes we can't remove a generated temporary file
-        assert False, 'TaxCalcIO.analyze(full_dump_output) failed'
-    # --dump output with partial dump
+    dumppath = tcio.output_filepath().replace('.xxx', '.db')
+    # minimal dump output
+    dumpvars = TaxCalcIO.MINIMAL_DUMPVARS
     try:
-        tcio.analyze(writing_output_file=True,
-                     dump_varset=set(['RECID', 'combined']),
-                     output_dump=True)
+        tcio.analyze(output_dump=True, dump_varlist=dumpvars)
     except Exception:  # pylint: disable=broad-except
-        if os.path.isfile(outfilepath):
+        if os.path.isfile(dumppath):
             try:
-                os.remove(outfilepath)
+                os.remove(dumppath)
             except OSError:
                 pass  # sometimes we can't remove a generated temporary file
-        assert False, 'TaxCalcIO.analyze(partial_dump_output) failed'
-    # if tries were successful, remove doc file and output file
-    docfilepath = outfilepath.replace('.csv', '-doc.text')
-    if os.path.isfile(docfilepath):
-        os.remove(docfilepath)
-    if os.path.isfile(outfilepath):
-        os.remove(outfilepath)
+        assert False, 'TaxCalcIO.analyze(minimal_dump_output) failed'
+    if os.path.isfile(dumppath):
+        os.remove(dumppath)
 
 
-def test_write_doc_file(reformfile1, assumpfile1):
+def test_output_options_mtr(reformfile1, assumpfile1):
     """
-    Test write_doc_file with compound reform.
+    Test TaxCalcIO output_dump options with mtr_* dump variables.
     """
     taxyear = 2021
-    compound_reform = f'{reformfile1.name}+{reformfile1.name}'
     tcio = TaxCalcIO(input_data=pd.read_csv(StringIO(RAWINPUT)),
                      tax_year=taxyear,
                      baseline=None,
-                     reform=compound_reform,
+                     reform=reformfile1.name,
                      assump=assumpfile1.name)
     assert not tcio.errmsg
     tcio.init(input_data=pd.read_csv(StringIO(RAWINPUT)),
               tax_year=taxyear,
               baseline=None,
-              reform=compound_reform,
+              reform=reformfile1.name,
               assump=assumpfile1.name,
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    tcio.write_doc_file()
-    outfilepath = tcio.output_filepath()
-    docfilepath = outfilepath.replace('.csv', '-doc.text')
-    if os.path.isfile(docfilepath):
-        os.remove(docfilepath)
+    dumppath = tcio.output_filepath().replace('.xxx', '.db')
+    # minimal+mtr_* dump output
+    dumpvars = TaxCalcIO.MINIMAL_DUMPVARS
+    for var in TaxCalcIO.MTR_DUMPVARS:
+        dumpvars.append(var)
+    try:
+        tcio.analyze(output_dump=True, dump_varlist=dumpvars)
+    except Exception:  # pylint: disable=broad-except
+        if os.path.isfile(dumppath):
+            try:
+                os.remove(dumppath)
+            except OSError:
+                pass  # sometimes we can't remove a generated temporary file
+        assert False, 'TaxCalcIO.analyze(minimal_dump_output) failed'
+    if os.path.isfile(dumppath):
+        os.remove(dumppath)
 
 
-def test_sqldb_option(reformfile1, assumpfile1):
+def test_write_policy_param_files(reformfile1):
     """
-    Test TaxCalcIO output_sqldb option when not writing_output_file.
+    Test write_policy_params_files with compound reform.
     """
     taxyear = 2021
-    tcio = TaxCalcIO(input_data=pd.read_csv(StringIO(RAWINPUT)),
-                     tax_year=taxyear,
-                     baseline=None,
-                     reform=reformfile1.name,
-                     assump=assumpfile1.name)
+    compound_reform = f'{reformfile1.name}+{reformfile1.name}'
+    tcio = TaxCalcIO(
+        input_data=pd.read_csv(StringIO(RAWINPUT)),
+        tax_year=taxyear,
+        baseline=compound_reform,
+        reform=compound_reform,
+        assump=None,
+    )
     assert not tcio.errmsg
     tcio.init(input_data=pd.read_csv(StringIO(RAWINPUT)),
               tax_year=taxyear,
-              baseline=None,
-              reform=reformfile1.name,
-              assump=assumpfile1.name,
+              baseline=compound_reform,
+              reform=compound_reform,
+              assump=None,
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
+    tcio.write_policy_params_files()
     outfilepath = tcio.output_filepath()
-    dbfilepath = outfilepath.replace('.csv', '.db')
-    # --sqldb output
-    try:
-        tcio.analyze(writing_output_file=False, output_sqldb=True)
-    except Exception:  # pylint: disable=broad-except
-        if os.path.isfile(dbfilepath):
-            try:
-                os.remove(dbfilepath)
-            except OSError:
-                pass  # sometimes we can't remove a generated temporary file
-        assert False, 'ERROR: TaxCalcIO.analyze(sqldb) failed'
-    # if try was successful, remove the db file
-    if os.path.isfile(dbfilepath):
-        os.remove(dbfilepath)
+    for ext in ['-params.bas', '-params.ref']:
+        filepath = outfilepath.replace('.xxx', ext)
+        if os.path.isfile(filepath):
+            os.remove(filepath)
 
 
 def test_no_tables_or_graphs(reformfile1):
     """
-    Test TaxCalcIO with output_tables=True and output_graphs=True but
-    INPUT has zero weights.
+    Test TaxCalcIO with output_params=True and output_tables=True and
+    output_graphs=True but INPUT has zero weights.
     """
     # create input sample that cannot output tables or graphs
     nobs = 10
@@ -555,24 +538,12 @@ def test_no_tables_or_graphs(reformfile1):
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    # create TaxCalcIO tables file
-    tcio.analyze(writing_output_file=False,
+    # create several TaxCalcIO output files
+    tcio.analyze(output_params=True,
                  output_tables=True,
                  output_graphs=True)
     # delete tables and graph files
-    output_filename = tcio.output_filepath()
-    fname = output_filename.replace('.csv', '-tab.text')
-    if os.path.isfile(fname):
-        os.remove(fname)
-    fname = output_filename.replace('.csv', '-atr.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
-    fname = output_filename.replace('.csv', '-mtr.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
-    fname = output_filename.replace('.csv', '-pch.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
+    tcio.delete_output_files()
 
 
 def test_tables(reformfile1):
@@ -604,12 +575,8 @@ def test_tables(reformfile1):
               exact_calculations=False)
     assert not tcio.errmsg
     # create TaxCalcIO tables file
-    tcio.analyze(writing_output_file=False, output_tables=True)
-    # delete tables file
-    output_filename = tcio.output_filepath()
-    fname = output_filename.replace('.csv', '-tab.text')
-    if os.path.isfile(fname):
-        os.remove(fname)
+    tcio.analyze(output_tables=True)
+    tcio.delete_output_files()
 
 
 def test_graphs(reformfile1):
@@ -641,18 +608,9 @@ def test_graphs(reformfile1):
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    tcio.analyze(writing_output_file=False, output_graphs=True)
+    tcio.analyze(output_graphs=True)
     # delete graph files
-    output_filename = tcio.output_filepath()
-    fname = output_filename.replace('.csv', '-atr.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
-    fname = output_filename.replace('.csv', '-mtr.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
-    fname = output_filename.replace('.csv', '-pch.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
+    tcio.delete_output_files()
 
 
 @pytest.fixture(scope='session', name='warnreformfile')
@@ -694,7 +652,7 @@ def test_analyze_warnings_print(warnreformfile):
               aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
-    tcio.analyze(writing_output_file=False)
+    tcio.analyze()
     assert tcio.tax_year() == taxyear
 
 

taxcalc/utils.py

@@ -1160,7 +1160,7 @@ def xtr_graph_plot(data,
              line_color='blue', line_width=3, legend_label='Baseline')
     fig.line(lines.index, lines.reform,
              line_color='red', line_width=3, legend_label='Reform')
-    fig.circle(0, 0, visible=False)  # force zero to be included on y axis
+    fig.scatter(0, 0, visible=False)  # force zero to be included on y axis
     if xlabel == '':
         xlabel = data['xlabel']
     fig.xaxis.axis_label = xlabel
@@ -1295,8 +1295,8 @@ def pch_graph_plot(data,
     fig.title.text_font_size = '12pt'
     line = data['line']
     fig.line(line.index, line.pch, line_color='blue', line_width=3)
-    fig.circle(0, 0, visible=False)  # force zero to be included on y axis
-    zero_grid_line_range = range(0, 101)
+    fig.scatter(0, 0, visible=False)  # force zero to be included on y axis
+    zero_grid_line_range = line.index
     zero_grid_line_height = [0] * len(zero_grid_line_range)
     fig.line(zero_grid_line_range, zero_grid_line_height,
              line_color='black', line_width=1)
@@ -1311,13 +1311,7 @@ def pch_graph_plot(data,
     fig.yaxis.axis_label_text_font_size = '12pt'
     fig.yaxis.axis_label_text_font_style = 'normal'
     fig.yaxis[0].formatter = PrintfTickFormatter(format='%.1f')
-    # bokeh cannot save this fig saying:
-    #   bokeh.core.serialization.SerializationError:
-    #   can't serialize <class 'range'>
-    # so the "return fig" statement is replaced by Python's implicit
-    # "return None" until the above logic can be made compatible with
-    # modern bokeh packages
-    # return fig
+    return fig
 
 
 def write_graph_file(figure, filename, title):

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: taxcalc
-Version: 4.5.0
+Version: 4.6.1
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -29,6 +29,7 @@ Dynamic: description-content-type
 Dynamic: download-url
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{taxcalc-4.5.0.dist-info → taxcalc-4.6.1.dist-info}/RECORD

@@ -1,32 +1,32 @@
-taxcalc/__init__.py,sha256=O3W2sl_0F5hGyJgbCgbIhTcLOaaF8KlBCGTsMaGgPmA,536
-taxcalc/calcfunctions.py,sha256=kdORtubtTHM8-heE4nbwtGnzdAflCpv0o5hlXmgzUPo,148649
-taxcalc/calculator.py,sha256=bZl-TY7JOjiiQymmUCvqrJePq7TQniItZrShfG8AJ2Y,64000
+taxcalc/__init__.py,sha256=_SNXt6U2NMWDx1hqcUw-N6_SVHp4pydp4-U1VFEPldY,536
+taxcalc/calcfunctions.py,sha256=G62sQeW-YHJ2gvqOfidRKPBpufSHzXYIdI2PGcApOuU,148423
+taxcalc/calculator.py,sha256=cCsis9yQSyw4eXvYppk7Z70JEaPH8Kd1AADlIqnJhVw,63930
 taxcalc/conftest.py,sha256=nO4J7qu1sTHgjqrzhpRMvfMJUrNm6GP_IsSuuDt_MeQ,141
 taxcalc/consumption.json,sha256=FBgDd72AZnviQRhGz5rPgpGpOmaOzNYfGB9GdTCeKPI,8102
 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=ERqmDQFi3yrl1uLvPs1C1tZN-711nsP8PyStVKU378g,11679
+taxcalc/data.py,sha256=QRyLsq250OsxUIjsuCFtREJsVyEOGaivwcON3teivMI,11698
 taxcalc/decorators.py,sha256=EwyVH4fSDf8x_BHzccf4-DRopo6KMVidYSYZFy_dJy0,11307
 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=pvr3m4G-fA_d-LMqCNYdBtJDjkDcHLgOgw0kmchYhFk,33235
-taxcalc/policy.py,sha256=BN6v8B9wbRZR-zEEHraOCbXP-2mgO7Hlc3niiN8tKRo,7074
-taxcalc/policy_current_law.json,sha256=wShNXGgb8Qgjbsk3bFpZyfeBifMeSgdzQ4Ln32iVKcQ,690298
+taxcalc/parameters.py,sha256=pxW53fOJkW7yM7XxN04RDNs-f7CwKOjE4vMmMvPtZ8E,33121
+taxcalc/policy.py,sha256=4bY3beSYhLKk_X4CTgG7LGnVnILM0D4Invt7uCp8dlA,6725
+taxcalc/policy_current_law.json,sha256=enemNPLg0ZlwNQVVK51XJru_YzDzPnV7ClNhdJHlhJQ,689915
 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=rzZCUYdsFQ9d7xlv9c4cNO8rFffbx9CL465e7q5X-EQ,35629
-taxcalc/utils.py,sha256=GZpF1jRJG4pZfi1Ic1pVfcplS4KPqwSECM23FKYSsjg,62705
+taxcalc/taxcalcio.py,sha256=1xZ17wZ0yqZeDDa5glEQpCG6xvXJ4wGxbUQPkmTLTD0,34752
+taxcalc/utils.py,sha256=noHnQ-tw0AXhEH-OgdTUiPedH8luVOJ5NdfpKI3_obw,62401
 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=W1wORfxidGDctXs-pIZoevpXmM3hLJNREs_ldl08c3w,12130
+taxcalc/cli/tc.py,sha256=StZo-46v1c3ozP-64wQWz0uyHOEVqZPAzgTr1JuoFjU,16614
 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
@@ -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=V__3vOQWLs22Ke6c5hvvLcSn1tfsq4d1jW__h5DbhIY,3020
+taxcalc/reforms/ext.json,sha256=578ckWd4bTbH_XnTR-smMKtE7Auu9seGn7de_hsGIos,3130
 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
@@ -83,10 +83,10 @@ taxcalc/tests/pufcsv_agg_expect.csv,sha256=h0r6MtsFEBa1u5zwpRT4fDx2T__ZAkdx4oeLx
 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=1qhmDS3bdfNHNgz4pggaE6LduT3KKUtOsdtqP3QSIYQ,3601
+taxcalc/tests/test_4package.py,sha256=I9i5rWFsg-VCtTLmUWIi9dnusieTZeodrgH8ba_Fbng,3681
 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=1zXuFWl_APATISHnS-noJSg1Zeyqfs2UKRGXnlRz-C8,36089
+taxcalc/tests/test_calculator.py,sha256=lcnBli5giNFxqgCLW-MF4J_wsV3gSFqCjzJdCJkihek,36085
 taxcalc/tests/test_compare.py,sha256=WglH4ZJOEQnav_mAmnGjpb7dooXcQsB1m04hgQeoBUQ,10873
 taxcalc/tests/test_compatible_data.py,sha256=XpfnE96HDvlgJM_8KEasgufxeiePTFfNMBBVlfzHP9Y,13477
 taxcalc/tests/test_consumption.py,sha256=c6zi9GqNK54cgfzxiWmY10UxOMJZ9vd9fOTwUKU1zMk,6318
@@ -100,9 +100,9 @@ taxcalc/tests/test_policy.py,sha256=hJrFqqptMoUWk3abIJ2sdADQtCqvGaUeW5as1aNwhR8,
 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=GqknkI69dot_yo_6M2q3CV5cK-OEYy7SohWqLuQ3gDw,16046
+taxcalc/tests/test_reforms.py,sha256=djVxMOE2RytmDDYvzS55AnThRRBcVc_calPbfHuvQ-k,16033
 taxcalc/tests/test_responses.py,sha256=2CkVVdaDNCSALMoUcGgweRlS2tfsK3kXogHtDkZMqJU,1663
-taxcalc/tests/test_taxcalcio.py,sha256=TzPk_q4ryQbF1lUDxd4jLpjoAkpgR4kXRWyuC1Lo3wc,25124
+taxcalc/tests/test_taxcalcio.py,sha256=PV7hCntwp_1LHQYlft7WelbzKSoi5aWzUZqhJAcC5AE,23135
 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.5.0.dist-info/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
-taxcalc-4.5.0.dist-info/METADATA,sha256=whq0fyPjdWtWiaVXA4--N9XooNvXa3TNhY1UDj-vh9g,3487
-taxcalc-4.5.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-taxcalc-4.5.0.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
-taxcalc-4.5.0.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
-taxcalc-4.5.0.dist-info/RECORD,,
+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.5.0.dist-info → taxcalc-4.6.1.dist-info}/WHEEL

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