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

taxcalc/tests/test_cpscsv.py

@@ -13,8 +13,6 @@ Read Tax-Calculator/TESTING.md for details.
 # pylint --disable=locally-disabled test_cpscsv.py
 
 import os
-import json
-import pytest
 import numpy as np
 import pandas as pd
 from taxcalc.growfactors import GrowFactors
@@ -28,7 +26,6 @@ START_YEAR = 2017
 NUM_YEARS = 19
 
 
-@pytest.mark.cpscsv_agg
 def test_agg(tests_path, cps_fullsample):
     """
     Test current-law aggregate taxes using cps.csv file.
@@ -103,25 +100,6 @@ def test_agg(tests_path, cps_fullsample):
         raise ValueError(msg)
 
 
-def test_cps_availability(tests_path, cps_path):
-    """
-    Cross-check records_variables.json data with variables in cps.csv file.
-    """
-    cpsdf = pd.read_csv(cps_path)
-    cpsvars = set(list(cpsdf))
-    # make set of variable names that are marked as cps.csv available
-    rvpath = os.path.join(tests_path, '..', 'records_variables.json')
-    with open(rvpath, 'r', encoding='utf-8') as rvfile:
-        rvdict = json.load(rvfile)
-    recvars = set()
-    for vname, vdict in rvdict['read'].items():
-        if 'taxdata_cps' in vdict.get('availability', ''):
-            recvars.add(vname)
-    # check that cpsvars and recvars sets are the same
-    assert (cpsvars - recvars) == set()
-    assert (recvars - cpsvars) == set()
-
-
 def nonsmall_diffs(linelist1, linelist2, small=0.0):
     """
     Return True if line lists differ significantly; otherwise return False.

taxcalc/tests/test_data.py

@@ -67,6 +67,7 @@ def test_recs_class(recs_varinfo_file, cps_subsample):
     """
     Specify Data-derived Recs class and test it.
     """
+    # pylint: disable=too-many-statements
 
     class Recs(Data):
         """
@@ -84,6 +85,9 @@ def test_recs_class(recs_varinfo_file, cps_subsample):
                 self, 'e00300', val * self.gfactors.factor_value('AINTS', year)
             )
 
+    # create CPS weights DataFrame
+    wghts_path = os.path.join(GrowFactors.FILE_PATH, 'cps_weights.csv.gz')
+    wghts_df = pd.read_csv(wghts_path)
     # test Recs class for incorrect instantiation:
     with pytest.raises(ValueError):
         Recs(data=[], start_year=2000,
@@ -100,7 +104,10 @@ def test_recs_class(recs_varinfo_file, cps_subsample):
     with pytest.raises(ValueError):
         Recs(data=cps_subsample, start_year=2000,
              gfactors='', weights='')
-    # test Recs class for correct instantiation with no aging of data:
+    with pytest.raises(ValueError):
+        Recs(data=cps_subsample, start_year=2000,
+             gfactors=GrowFactors(), weights=wghts_df[:10])
+    # test Recs class for correct instantiation without aging of data:
     syr = 2014
     rec = Recs(data=cps_subsample, start_year=syr,
                gfactors=None, weights=None)
@@ -115,8 +122,6 @@ def test_recs_class(recs_varinfo_file, cps_subsample):
     assert np.allclose([sum_e00300_in_syr], [sum_e00300_in_syr_plus_one])
     del rec
     # test Recs class for correct instantiation with aging of data
-    wghts_path = os.path.join(GrowFactors.FILE_PATH, 'cps_weights.csv.gz')
-    wghts_df = pd.read_csv(wghts_path)
     rec = Recs(data=cps_subsample, start_year=syr,
                gfactors=GrowFactors(), weights=wghts_df)
     assert isinstance(rec, Recs)
@@ -138,3 +143,6 @@ def test_recs_class(recs_varinfo_file, cps_subsample):
     rec._read_weights(weights=None)
     with pytest.raises(ValueError):
         rec._read_weights(weights=[])
+    incomplete_data = pd.DataFrame({'MARS': np.array([1, 2, 3])})
+    with pytest.raises(ValueError):
+        rec._read_data(data=incomplete_data)

taxcalc/tests/test_parameters.py

@@ -626,3 +626,45 @@ def test_read_json_revision_foramts(params, is_paramtools):
     assert is_paramtools_format(result) is is_paramtools
     if is_paramtools:
         assert result == json.loads(params)["consumption"]
+
+
+def test_compatible_data_presence():
+    """
+    Test that every parameter in the policy_current_law.json file
+    has a compatible_data field that is a dictionary.
+    """
+    compatible_data_keys_set = set(["puf", "cps"])
+
+    # nested function used only in test_compatible_data_presence test
+    def valid_compatible_data(compatible_data):
+        """
+        Return True if compatible_data is a valid dictionary;
+        otherwise return False
+        """
+        if not isinstance(compatible_data, dict):
+            return False
+        if set(compatible_data.keys()) != compatible_data_keys_set:
+            return False
+        for key in compatible_data:
+            boolean = (compatible_data[key] is True or
+                       compatible_data[key] is False)
+            if not boolean:
+                return False
+        return True
+
+    # main logic of test_compatible_data_presence test
+    clp = Policy()
+    allparams = clp.metadata()
+    problem_pnames = []
+    for pname in allparams:
+        if "compatible_data" in allparams[pname]:
+            compatible_data = allparams[pname]["compatible_data"]
+        else:
+            compatible_data = None
+        if not valid_compatible_data(compatible_data):
+            problem_pnames.append(pname)
+    if problem_pnames:
+        msg = "{} has no or invalid compatible_data field"
+        for pname in problem_pnames:
+            print(msg.format(pname))
+        assert False, "ERROR: list of problem_pnames is above"

taxcalc/tests/test_records.py

@@ -29,10 +29,80 @@ def test_incorrect_records_instantiation(cps_subsample, cps_fullsample):
         _ = Records(data=cps_subsample, gfactors=None, weights=None,
                     adjust_ratios=[])
     # test error raise when num of records is greater than num of weights
-    wghts_path = os.path.join(Records.CODE_PATH, Records.PUF_WEIGHTS_FILENAME)
-    puf_wghts = pd.read_csv(wghts_path)
+    cps_weights_path = os.path.join(Records.CODE_PATH, 'cps_weights.csv.gz')
+    weights = pd.read_csv(cps_weights_path)
+    some_wghts = weights[:100]
     with pytest.raises(ValueError):
-        _ = Records(data=cps_fullsample, weights=puf_wghts, start_year=2020)
+        _ = Records(data=cps_fullsample, weights=some_wghts, start_year=2020)
+
+
+def test_invalid_variable_values_1(cps_subsample):
+    """Test docstring"""
+    dta = cps_subsample.copy()
+    dta['PT_SSTB_income'] = 2
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['e01700'] = 1000
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['e00650'] = 1000
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['k1bx14s'] = 1000
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['e02100'] = dta['e02100p'] + dta['e02100s'] + 1000
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['e00900'] = dta['e00900p'] + dta['e00900s'] + 1000
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['e00200'] = dta['e00200p'] + dta['e00200s'] + 1000
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['EIC'] = 4
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta['MARS'] = 0
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+
+
+def test_invalid_variable_values_2():
+    """Test docstring"""
+    dta = pd.DataFrame(
+        {
+            'RECID': [1],
+            'MARS': [1],
+            'e00200p': [8e4],
+            'e00200s': [1e4],
+            'e00200': [9e4],
+        }
+    )
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta = pd.DataFrame(
+        {
+            'RECID': [1],
+            'MARS': [1],
+            'e00900p': [8e4],
+            'e00900s': [1e4],
+            'e00900': [9e4],
+        }
+    )
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
+    dta = pd.DataFrame(
+        {
+            'RECID': [1],
+            'MARS': [1],
+            'e02100p': [8e4],
+            'e02100s': [1e4],
+            'e02100': [9e4],
+        }
+    )
+    with pytest.raises(ValueError):
+        _ = Records(data=dta, start_year=2000)
 
 
 def test_correct_records_instantiation(cps_subsample):
@@ -45,16 +115,15 @@ def test_correct_records_instantiation(cps_subsample):
     rec1.increment_year()
     sum_e00200_in_cps_year_plus_one = getattr(rec1, 'e00200').sum()
     assert sum_e00200_in_cps_year_plus_one == sum_e00200_in_cps_year
-    wghts_path = os.path.join(Records.CODE_PATH, Records.CPS_WEIGHTS_FILENAME)
+    wghts_path = os.path.join(Records.CODE_PATH, 'cps_weights.csv.gz')
     wghts_df = pd.read_csv(wghts_path)
-    ratios_path = os.path.join(Records.CODE_PATH, Records.PUF_RATIOS_FILENAME)
-    ratios_df = pd.read_csv(ratios_path, index_col=0).transpose()
     rec2 = Records(data=cps_subsample,
                    start_year=Records.CPSCSV_YEAR,
                    gfactors=GrowFactors(),
                    weights=wghts_df,
-                   adjust_ratios=ratios_df,
-                   exact_calculations=False)
+                   adjust_ratios=None,
+                   exact_calculations=False,
+                   weights_scale=0.01)
     assert rec2
     assert np.all(getattr(rec2, 'MARS') != 0)
     assert getattr(rec2, 'current_year') == getattr(rec2, 'data_year')
@@ -249,3 +318,65 @@ def test_csv_input_vars_md_contents(tests_path):
         for var in valid_less_civ:
             msg += f'VARIABLE= {var}\n'  # pylint: disable=consider-using-join
         raise ValueError(msg)
+
+
+def test_cps_availability(tests_path, cps_data_path):
+    """
+    Cross-check records_variables.json data with variables in cps.csv file.
+    """
+    # make set of variable names that are in the cps.csv file
+    cpsdf = pd.read_csv(cps_data_path)
+    cpsvars = set(sorted(list(cpsdf)))
+    # make set of variable names that are marked as cps available in r_v.json
+    rvpath = os.path.join(tests_path, '..', 'records_variables.json')
+    with open(rvpath, 'r', encoding='utf-8') as rvfile:
+        rvdict = json.load(rvfile)
+    recvars = set()
+    for vname, vdict in rvdict['read'].items():
+        if 'taxdata_cps' in vdict.get('availability', ''):
+            recvars.add(vname)
+    # check that cpsvars and recvars sets are the same
+    assert (cpsvars - recvars) == set()
+    assert (recvars - cpsvars) == set()
+
+
+@pytest.mark.requires_puf
+def test_puf_availability(tests_path, puf_data_path):
+    """
+    Cross-check records_variables.json data with variables in puf.csv file
+    """
+    # make set of variable names that are in the puf.csv file
+    pufdf = pd.read_csv(puf_data_path)
+    pufvars = set(sorted(list(pufdf)))
+    # make set of variable names that are marked as puf available in r_v.json
+    rvpath = os.path.join(tests_path, '..', 'records_variables.json')
+    with open(rvpath, 'r', encoding='utf-8') as rvfile:
+        rvdict = json.load(rvfile)
+    recvars = set()
+    for vname, vdict in rvdict['read'].items():
+        if 'taxdata_puf' in vdict.get('availability', ''):
+            recvars.add(vname)
+    # check that pufvars and recvars sets are the same
+    assert (pufvars - recvars) == set()
+    assert (recvars - pufvars) == set()
+
+
+@pytest.mark.requires_tmd
+def test_tmd_availability(tests_path, tmd_data_path):
+    """
+    Cross-check records_variables.json data with variables in tmd.csv file
+    """
+    # make set of variable names that are in the tmd.csv file
+    tmddf = pd.read_csv(tmd_data_path)
+    tmdvars = set(sorted(list(tmddf)))
+    # make set of variable names that are marked as tmd available in r_v.json
+    rvpath = os.path.join(tests_path, '..', 'records_variables.json')
+    with open(rvpath, 'r', encoding='utf-8') as rvfile:
+        rvdict = json.load(rvfile)
+    recvars = set()
+    for vname, vdict in rvdict['read'].items():
+        if 'taxmicrodata_tmd' in vdict.get('availability', ''):
+            recvars.add(vname)
+    # check that tmdvars and recvars sets are the same
+    assert (tmdvars - recvars) == set()
+    assert (recvars - tmdvars) == set()

taxcalc/tests/test_reforms.py

@@ -266,12 +266,12 @@ def test_reform_json_and_output(reform_file, tax_year, tests_path):
         raise ValueError(msg)
 
 
-def reform_results(rid, reform_dict, puf_data, reform_2017_law):
+def reform_results(rid, reform_dict, cps_data, reform_2017_law):
     """
     Return actual results of the reform specified by rid and reform_dict.
     """
     # pylint: disable=too-many-locals
-    rec = Records(data=puf_data)
+    rec = Records.cps_constructor(data=cps_data)
     # create baseline Calculator object, calc1
     pol = Policy()
     if reform_dict['baseline'] == '2017_law.json':
@@ -336,24 +336,22 @@ def fixture_reforms_dict(tests_path):
 NUM_REFORMS = 60  # when changing this also change num_reforms in conftest.py
 
 
-@pytest.mark.requires_pufcsv
 @pytest.mark.parametrize('rid', list(range(1, NUM_REFORMS + 1)))
 def test_reforms(rid, test_reforms_init, tests_path, baseline_2017_law,
-                 reforms_dict, puf_subsample):
+                 reforms_dict, cps_subsample):
     """
     Write actual reform results to files.
     """
     # pylint: disable=too-many-arguments,too-many-positional-arguments
     assert test_reforms_init == NUM_REFORMS
     actual = reform_results(rid, reforms_dict[str(rid)],
-                            puf_subsample, baseline_2017_law)
+                            cps_subsample, baseline_2017_law)
     afile_path = os.path.join(tests_path, f'reform_actual_{rid}.csv')
     with open(afile_path, 'w', encoding='utf-8') as afile:
         afile.write('rid,res1,res2,res3,res4\n')
         afile.write(f'{actual}\n')
 
 
-@pytest.mark.cps
 @pytest.mark.parametrize('reform_filename, expected_diff', [
     ('ext.json', 45.491),
     ('OBBBA.json', 0.0),

taxcalc/tests/test_taxcalcio.py

@@ -320,50 +320,10 @@ def test_init_errors(reformfile0, errorreformfile, errorassumpfile,
     # test TaxCalcIO.init method
     tcio.init(input_data=recdf, tax_year=year,
               baseline=baseline, reform=reform, assump=assump,
-              aging_input_data=False,
               exact_calculations=True)
     assert tcio.errmsg
 
 
-def test_creation_with_aging(reformfile0):
-    """
-    Test TaxCalcIO instantiation with/without no policy reform and with aging.
-    """
-    taxyear = 2021
-    tcio = TaxCalcIO(input_data=pd.read_csv(StringIO(RAWINPUT)),
-                     tax_year=taxyear,
-                     baseline=None,
-                     reform=reformfile0.name,
-                     assump=None,
-                     silent=False)
-    assert not tcio.errmsg
-    tcio.init(input_data=pd.read_csv(StringIO(RAWINPUT)),
-              tax_year=taxyear,
-              baseline=None,
-              reform=reformfile0.name,
-              assump=None,
-              aging_input_data=True,
-              exact_calculations=False)
-    assert not tcio.errmsg
-    assert tcio.tax_year() == taxyear
-    taxyear = 2016
-    tcio = TaxCalcIO(input_data=pd.read_csv(StringIO(RAWINPUT)),
-                     tax_year=taxyear,
-                     baseline=None,
-                     reform=None,
-                     assump=None)
-    assert not tcio.errmsg
-    tcio.init(input_data=pd.read_csv(StringIO(RAWINPUT)),
-              tax_year=taxyear,
-              baseline=None,
-              reform=None,
-              assump=None,
-              aging_input_data=True,
-              exact_calculations=False)
-    assert not tcio.errmsg
-    assert tcio.tax_year() == taxyear
-
-
 def test_ctor_init_with_cps_files():
     """
     Test use of CPS input files.
@@ -372,23 +332,17 @@ def test_ctor_init_with_cps_files():
     txyr = 2020
     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,
-        )
+        tcio.init('cps.csv', txyr, None, None, None, 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)
+        tcio.advance_to_year(txyr + 1)
         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)
-    tcio.init('cps.csv', txyr, None, None, None,
-              aging_input_data=True,
-              exact_calculations=False)
+    tcio.init('cps.csv', txyr, None, None, None, exact_calculations=False)
     assert tcio.errmsg
 
 
@@ -424,7 +378,6 @@ def test_dump_variables(dumpvar_str, str_valid, num_vars):
     assert not tcio.errmsg
     tcio.init(input_data=recdf, tax_year=year,
               baseline=None, reform=None, assump=None,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     varlist = tcio.dump_variables(dumpvar_str)
@@ -451,7 +404,6 @@ def test_output_options_min(reformfile1, assumpfile1):
               baseline=None,
               reform=reformfile1.name,
               assump=assumpfile1.name,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     dumppath = tcio.output_filepath().replace('.xxx', '.dumpdb')
@@ -486,7 +438,6 @@ def test_output_options_mtr(reformfile1, assumpfile1):
               baseline=None,
               reform=reformfile1.name,
               assump=assumpfile1.name,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     dumppath = tcio.output_filepath().replace('.xxx', '.dumpdb')
@@ -526,7 +477,6 @@ def test_write_policy_param_files(reformfile1):
               baseline=compound_reform,
               reform=compound_reform,
               assump=None,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     tcio.write_policy_params_files()
@@ -563,7 +513,6 @@ def test_no_tables_or_graphs(reformfile1):
               baseline=None,
               reform=reformfile1.name,
               assump=None,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     # create several TaxCalcIO output files
@@ -599,7 +548,6 @@ def test_tables(reformfile1):
               baseline=None,
               reform=reformfile1.name,
               assump=None,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     # create TaxCalcIO tables file
@@ -633,7 +581,6 @@ def test_graphs(reformfile1):
               baseline=None,
               reform=reformfile1.name,
               assump=None,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     tcio.analyze(output_graphs=True)
@@ -677,7 +624,6 @@ def test_analyze_warnings_print(warnreformfile):
               baseline=None,
               reform=warnreformfile.name,
               assump=None,
-              aging_input_data=False,
               exact_calculations=False)
     assert not tcio.errmsg
     tcio.analyze()
@@ -745,7 +691,6 @@ def test_error_message_parsed_correctly(regression_reform_file):
               baseline=regression_reform_file.name,
               reform=regression_reform_file.name,
               assump=None,
-              aging_input_data=False,
               exact_calculations=False)
     assert isinstance(tcio.errmsg, str) and tcio.errmsg
     exp_errmsg = (

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxcalc
-Version: 5.3.0
+Version: 6.0.0
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator

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

@@ -1,32 +1,30 @@
-taxcalc/__init__.py,sha256=5kXLxekmfAIGKSaI0ownFFGPUYrcMHVGjsgkyQE-KgA,536
+taxcalc/__init__.py,sha256=bx1f6yo5NhIJZFyNhOBAu1hfPUE-LyHd1l2Y-fMfpAc,536
 taxcalc/calcfunctions.py,sha256=8XUhXncnsRkqDL-3uqH1Ew2HIMs3p-gf97KHRKnJZJM,135517
-taxcalc/calculator.py,sha256=nO4GM9pCY4vvmXMcExc9cgEfrMJj-A6Z9aKODHdjPLQ,64135
+taxcalc/calculator.py,sha256=u7I5Wru2RTdo1G4tJ4RBGsAzrvx78VGUhZyegiIf8dg,64151
 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=gCdPszWUgPP5kCSpsAiL_4ytC6j32TVaiaEqjnqZAgc,11698
+taxcalc/data.py,sha256=8whYnj8qRZiYi6iUjLvRQbIZrUjj9zqIxNGcEJ933jw,11676
 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=OrYmlWMQAmoMe5fhgnPJcIdvFs0aDf9JBy2aU7J0kBQ,6576
 taxcalc/parameters.py,sha256=ObwQMBlPjq3tyNwiR94Nj0zouIVsNaHIho-OQK1RNKg,35966
-taxcalc/policy.py,sha256=e24edxUHND-WujHZl_FUp6h9ECgeC3sRu908vom7qjs,9415
+taxcalc/policy.py,sha256=vLhqvbsOrImpb0BsRhmgdrnRCsOvPWUc_fTUSYq8yOM,8700
 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=TR29dAdYer85Bo8HFljt9dYqsIL7AvmWx0xRe3-ZNpY,38543
+taxcalc/records.py,sha256=IrUlfM3AiVq2K_rp_jBOc5X2h6PKREQf_MmfgJDjdpY,17490
+taxcalc/records_variables.json,sha256=-yo5d9kVvCgVCdx8E8bOiZlC_Pu-zjznjLeYWTiT4Uw,44583
+taxcalc/taxcalcio.py,sha256=CjByunQKr6Jc-bSPZjso7bjb6KW5nMNVy3CaDdBdLyo,39047
 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=m8KRiR0sUS3w2q0WhSwowYb-GCzRcbvfqOhc_-GR1OM,18982
+taxcalc/cli/tc.py,sha256=YAtcWnGcwTgT3DJIWbwfHAtonXav8k2X_yDV5fCxf8M,18760
 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
@@ -74,34 +72,30 @@ 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=HT5faHHoYgyRzOOyhP1EzUfie7l9TmiBAqgC_y9F0M4,5164
+taxcalc/tests/conftest.py,sha256=XCqh5cZglHXyDd_zcpttlJk7nIV95IdxKTXlEC8zbeE,5371
 taxcalc/tests/cpscsv_agg_expect.csv,sha256=80Sq2GlP2oz4vKJfrarYy4qRGWNxUs7DSBYV2qxesGk,3511
 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/reforms_expect.csv,sha256=AhrIJP2fON8d1exXJ6yLwnng0bm1X4dGn0IokP5ItQA,1354
 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=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_calculator.py,sha256=ZOqfg6yM93qivNnKiLZVC_OiCtdauDVN036ERPu6Wy8,35037
 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_cpscsv.py,sha256=pc-TGmAXcHL1_3g1Dyityad7Rm16Oem4YYOLMWS0t1g,7628
+taxcalc/tests/test_data.py,sha256=xXbbVrBCgGJTyqxyk17LTxJbf2W1A93HOws-20G0aGk,4831
 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=b_Gzy_23M95CdQV1fSr06bW3cXWcnAN-AgcB10EOxhQ,20612
+taxcalc/tests/test_parameters.py,sha256=LqN0zNfkvovzdDlFzS7CGF-mXAF_XTZd2Wb6ylqOugA,22102
 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_records.py,sha256=mB0BcEDzfrq1UHWGVRNf99xW-D9yjufAKtciAlTgDMw,13467
+taxcalc/tests/test_reforms.py,sha256=IWOCWvq412hV1I7u_Tduj6kQM_IsyHBztgOT6Z2A5-w,15133
 taxcalc/tests/test_responses.py,sha256=2CkVVdaDNCSALMoUcGgweRlS2tfsK3kXogHtDkZMqJU,1663
-taxcalc/tests/test_taxcalcio.py,sha256=_2g5vtPRNSVQeArmsioCoHmOkg_jpQ1gscGNNf0pw7E,24051
+taxcalc/tests/test_taxcalcio.py,sha256=OzSkDvqINcgPWg1ANErZ5L3fl2la8IRj1dw6_9rP798,22207
 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
@@ -130,9 +124,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.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-6.0.0.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
+taxcalc-6.0.0.dist-info/METADATA,sha256=PGKspEXSi4R_SU2zDezHX9q8Q2iPgpk6xUU3E6WCYtk,3509
+taxcalc-6.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+taxcalc-6.0.0.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
+taxcalc-6.0.0.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
+taxcalc-6.0.0.dist-info/RECORD,,

taxcalc/puf_ratios.csv

@@ -1,26 +0,0 @@
-agi_bin,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18
-INT2011,1.0259,0.5597,0.9448,0.9681,0.9728,0.9464,0.8390,0.8997,0.9713,0.9239,0.9342,0.9413,0.9497,0.9510,0.9693,0.9702,0.9569,1.0123,1.7014
-INT2012,0.7778,0.9454,0.8433,0.8152,0.7153,0.8101,0.7961,0.7940,0.8481,0.9063,0.9129,0.9183,1.0343,1.0435,1.0129,1.1436,1.0975,1.2339,1.3445
-INT2013,1.1325,0.7670,0.7821,0.7778,0.8935,0.8699,0.9558,0.9045,0.8342,0.8595,0.9746,1.0269,1.0499,1.0505,1.0891,0.9632,1.0449,0.9690,1.1443
-INT2014,0.9106,0.8669,0.8492,0.7738,0.8431,0.8802,0.9729,0.8840,0.8368,1.0109,0.8448,1.0532,1.0274,0.9291,1.0609,1.1524,1.0624,1.0728,1.0860
-INT2015,0.9813,0.9511,0.9323,0.9470,0.9543,0.9246,0.9368,0.9315,0.9463,0.9698,0.9887,1.0165,0.9966,0.9906,1.0241,0.9827,1.0221,1.1437,1.1671
-INT2016,0.9843,1.0086,1.0453,1.0319,1.0447,1.0342,1.0110,1.0028,1.0025,1.0174,0.9482,0.9531,0.9752,1.0131,1.0723,1.0130,1.0804,1.0810,0.9938
-INT2017,0.9932,0.9174,0.8978,0.8918,0.8944,0.9131,0.9215,0.9399,0.9611,0.9788,1.0156,1.0693,1.0312,0.9881,0.9354,0.9756,0.9565,1.0484,1.1942
-INT2018,0.9991,0.9744,0.9683,0.9673,0.9757,0.9725,0.9748,0.9779,0.9742,0.9969,0.9929,1.0038,1.0148,1.0067,1.0226,0.9898,1.0182,1.0909,0.9981
-INT2019,0.9979,0.9771,0.9763,0.9903,0.9793,0.9805,0.9769,0.9852,0.9826,0.9937,0.9934,1.0109,1.0020,1.0074,0.9985,1.0006,1.0253,1.0283,1.0196
-INT2020,1.0017,0.9799,0.9739,0.9756,0.9843,0.9849,0.9831,0.9833,0.9932,0.9965,0.9958,1.0114,1.0058,1.0047,1.0076,0.9991,1.0129,1.0113,1.0113
-INT2021,0.9959,0.9797,0.9776,0.9781,0.9836,0.9898,0.9883,0.9869,0.9920,0.9978,1.0043,0.9974,1.0066,1.0119,1.0049,1.0040,1.0303,1.0085,1.0022
-INT2022,1.0062,0.9815,0.9810,0.9783,0.9724,0.9820,0.9850,0.9893,0.9934,1.0049,1.0022,1.0050,1.0029,1.0042,1.0047,1.0044,1.0133,0.9990,1.0111
-INT2023,0.9983,0.9812,0.9761,0.9789,0.9891,0.9893,0.9852,1.0199,0.9942,0.9956,1.0022,1.0012,1.0023,1.0073,1.0006,1.0093,1.0214,1.0020,0.9943
-INT2024,1.0016,0.9843,0.9813,0.9791,0.9712,0.9789,0.9893,1.0100,0.9905,0.9984,0.9987,0.9971,1.0048,1.0077,1.0089,1.0075,1.0238,1.0148,1.0081
-INT2025,1.0086,0.9934,0.9772,0.9767,0.9834,0.9817,1.0012,0.9941,0.9935,1.0008,0.9990,0.9978,1.0051,1.0074,1.0142,1.0150,1.0238,0.9941,0.9912
-INT2026,1.0089,0.9843,0.9792,0.9796,0.9872,0.9904,0.9989,0.9909,0.9953,0.9939,0.9931,0.9932,1.0070,1.0142,1.0373,1.0250,1.0208,0.9992,0.9937
-INT2027,1.0115,0.9888,0.9839,0.9805,0.9888,0.9905,0.9824,0.9951,0.9905,0.9944,0.9993,0.9913,1.0073,1.0184,1.0175,1.0275,1.0259,0.9935,0.9946
-INT2028,1.0062,0.9977,0.9772,0.9829,0.9863,0.9878,1.0107,0.9957,0.9924,0.9954,0.9931,0.9921,1.0068,1.0177,1.0271,1.0221,1.0222,0.9960,0.9918
-INT2029,1.0101,0.9939,0.9780,0.9801,0.9824,0.9852,1.0025,0.9850,0.9945,0.9933,0.9934,0.9928,1.0033,1.0285,1.0278,1.0474,1.0236,1.0013,0.9924
-INT2030,1.0295,1.0010,0.9821,0.9840,0.9821,0.9917,0.9822,0.9859,0.9830,0.9890,0.9815,0.9922,1.0058,1.0359,1.0382,1.0449,1.0299,0.9947,0.9921
-INT2031,1.0280,1.0214,0.9858,0.9918,0.9829,0.9886,0.9858,0.9788,0.9910,0.9938,0.9791,0.9869,0.9950,1.0446,1.0442,1.0732,1.0287,1.0061,0.9932
-INT2032,1.0079,1.1009,0.9920,0.9811,0.9867,0.9849,0.9881,0.9740,0.9732,0.9791,0.9662,0.9835,0.9898,1.0786,1.0900,1.1373,1.0482,1.0099,0.9983
-INT2033,0.9352,0.8346,0.9707,0.9745,0.9896,0.9850,0.9878,1.0383,1.0313,1.0351,1.1156,1.0746,1.0377,0.8505,0.8247,0.7425,0.8974,1.0567,1.0930
-INT2034,1.0278,0.9998,0.9801,0.9808,0.9905,0.9879,0.9984,0.9804,0.9885,0.9931,0.9775,0.9841,1.0025,1.0381,1.0368,1.0580,1.0409,1.0028,0.9939
-INT2035,1.0241,1.0200,0.9891,0.9840,0.9837,0.9859,0.9886,0.9688,0.9850,0.9882,0.9774,0.9926,1.0011,1.0428,1.0542,1.0592,1.0396,0.9982,0.9940