taxcalc 5.0.0__py3-none-any.whl → 5.0.4__py3-none-any.whl

taxcalc/records.py

@@ -305,6 +305,8 @@ class Records(Data):
         self.e00200s *= gfv['AWAGE']
         self.pencon_p *= gfv['AWAGE']
         self.pencon_s *= gfv['AWAGE']
+        self.overtime_income *= gfv['AWAGE']
+        self.tip_income *= gfv['AWAGE']
         self.e00300 *= gfv['AINTS']
         self.e00400 *= gfv['AINTS']
         self.e00600 *= gfv['ADIVS']
@@ -377,6 +379,7 @@ class Records(Data):
         self.e87530 *= gfv['ATXPY']
         self.e87521 *= gfv['ATXPY']
         self.cmbtp *= gfv['ATXPY']
+        self.auto_loan_interest *= gfv['ATXPY']
         # BENEFITS
         self.other_ben *= gfv['ABENOTHER']
         self.mcare_ben *= gfv['ABENMCARE']

taxcalc/records_variables.json

@@ -647,6 +647,25 @@
       "desc": "Filing unit's share of total business property owned by the pass-through business",
       "form": {"2018-20??": "specified in custom data"},
       "availability": ""
+    },
+
+    "auto_loan_interest": {
+      "type": "float",
+      "desc": "Filing unit's interest payments on OBBBA-qualified auto loans",
+      "form": {"2025-20??": "specified in custom data"},
+      "availability": ""
+    },
+    "overtime_income": {
+      "type": "float",
+      "desc": "Filing unit's OBBBA-qualified overtime income",
+      "form": {"2025-20??": "specified in custom data"},
+      "availability": ""
+    },
+    "tip_income": {
+      "type": "float",
+      "desc": "Filing unit's OBBBA-qualified tip income",
+      "form": {"2025-20??": "specified in custom data"},
+      "availability": ""
     }
   },
   "calc": {
@@ -1130,6 +1149,21 @@
       "desc": "search taxcalc/calcfunctions.py for how calculated and used",
       "form": {"2013-20??": "calculated variable"}
     },
+    "auto_loan_interest_deduction": {
+      "type": "float",
+      "desc": "Deduction for payment of qualified auto loan interest",
+      "form": {"2025-20??": "calculated variable"}
+    },
+    "ALD_OvertimeIncome": {
+      "type": "float",
+      "desc": "Above-the-line deduction for qualified overtime income",
+      "form": {"2025-20??": "calculated variable"}
+    },
+    "ALD_TipIncome": {
+      "type": "float",
+      "desc": "Above-the-line deduction for qualified tip income",
+      "form": {"2025-20??": "calculated variable"}
+    },
     "ubi": {
       "type": "float",
       "desc": "Universal Basic Income benefit for filing unit",

taxcalc/reforms/ARPA.json

@@ -59,12 +59,12 @@
     "EITC_sep_filers_elig": {"2021": true},
     "CDCC_c": {"2021": 8000,
                "2022": 3000},
-    "CDCC_ps": {"2021": 125000,
-                "2022": 15000},
-    "CDCC_ps2": {"2021": 400000,
-                 "2022": 9e+99},
-    "CDCC_crt": {"2021": 0.5,
-                 "2022": 0.35},
+    "CDCC_ps1": {"2021": 125000,
+                 "2022": 15000},
+    "CDCC_ps2": {"2021": [400000, 400000, 400000, 400000, 400000],
+                 "2022": [9e+99, 9e+99, 9e+99, 9e+99, 9e+99]},
+    "CDCC_po1_rate_max": {"2021": 0.5,
+                          "2022": 0.35},
     "CDCC_refundable": {"2021": true,
                         "2022": false},
     "ALD_BusinessLosses_c": {"2026": [283535.22, 567070.42, 283535.22, 283535.22, 567070.42],

taxcalc/tests/reforms.json

@@ -134,7 +134,7 @@
   "15": {
       "baseline": "2017_law.json",
       "start_year": 2015,
-      "value": {"II_prt": 0.03},
+      "value": {"II_em_prt": 0.03},
       "name": "Increase personal exemption phaseout rate by 1 pts",
       "output_type": "iitax",
       "compare_with": {}

taxcalc/tests/test_calcfunctions.py

@@ -16,7 +16,7 @@ from taxcalc import calcfunctions
 
 class GetFuncDefs(ast.NodeVisitor):
     """
-    Return information about each function defined in the functions.py file.
+    Return information about each function defined in calcfunctions.py file.
     """
     def __init__(self):
         """
@@ -39,6 +39,8 @@ class GetFuncDefs(ast.NodeVisitor):
         """
         visit the specified FunctionDef node
         """
+        if node.name == 'SchXYZ':
+            return  # skipping SchXYZ function that has multiple returns
         self.fname = node.name
         self.fnames.append(self.fname)
         self.fargs[self.fname] = []
@@ -68,6 +70,7 @@ class GetFuncDefs(ast.NodeVisitor):
         self.generic_visit(node)
 
 
+@pytest.mark.calc_and_used_vars
 def test_calc_and_used_vars(tests_path):
     """
     Runs two kinds of tests on variables used in the calcfunctions.py file:
@@ -92,8 +95,6 @@ def test_calc_and_used_vars(tests_path):
     # .. create set of vars that are actually calculated in calcfunctions.py
     all_cvars = set()
     for fname in fnames:
-        if fname == 'BenefitSurtax':
-            continue  # because BenefitSurtax is not really a function
         all_cvars.update(set(cvars[fname]))
     # .. add to all_cvars set variables calculated in Records class
     all_cvars.update(set(['num', 'sep', 'exact']))
@@ -110,8 +111,7 @@ def test_calc_and_used_vars(tests_path):
             found_error1 = True
             msg1 += f'VAR NOT CALCULATED: {var}\n'
     # Test (2):
-    faux_functions = ['EITCamount', 'ComputeBenefit', 'BenefitPrograms',
-                      'BenefitSurtax', 'BenefitLimitation', 'SchXYZ']
+    faux_functions = ['EITCamount', 'SchXYZ', 'BenefitPrograms']
     found_error2 = False
     msg2 = 'calculated & returned variables are not function arguments\n'
     for fname in fnames:
@@ -157,8 +157,6 @@ def test_function_args_usage(tests_path):
         fname = match.group(1)
         fargs = match.group(2).split(',')  # list of function arguments
         fbody = match.group(3)
-        if fname == 'Taxes':
-            continue  # because Taxes has part of fbody in return statement
         for farg in fargs:
             arg = farg.strip()
             if fbody.find(arg) < 0:
@@ -558,6 +556,7 @@ def test_EITC(test_tuple, expected_value, skip_jit):
 
 # Parameter values for tests
 PT_qbid_rt = 0.2
+PT_qbid_limited = True
 PT_qbid_taxinc_thd = [160700.0, 321400.0, 160725.0, 160700.0, 321400.0]
 PT_qbid_taxinc_gap = [50000.0, 100000.0, 50000.0, 50000.0, 100000.0]
 PT_qbid_w2_wages_rt = 0.5
@@ -579,6 +578,7 @@ e02100 = [0.00, 0.00, 0.00, 0.00]
 e27200 = [0.00, 0.00, 0.00, 0.00]
 e00650 = [5000.00, 8000.00, 3000.00, 9000.00]
 c01000 = [7000.00, 4000.00, -3000.00, -3000.00]
+auto_loan_interest_deduction = [0.00, 0.00, 0.00, 1000.00]
 PT_SSTB_income = [0, 1, 1, 1]
 PT_binc_w2_wages = [0.00, 0.00, 0.00, 0.00]
 PT_ubia_property = [0.00, 0.00, 0.00, 0.00]
@@ -588,8 +588,9 @@ qbided = [0.0, 0.0, 0.0, 0.0]  # unimportant for function
 tuple0 = (
     c00100[0], standard[0], c04470[0], c04600[0], MARS[0], e00900[0],
     c03260[0], e26270[0],
-    e02100[0], e27200[0], e00650[0], c01000[0], PT_SSTB_income[0],
-    PT_binc_w2_wages[0], PT_ubia_property[0], PT_qbid_rt,
+    e02100[0], e27200[0], e00650[0], c01000[0],
+    auto_loan_interest_deduction[0], PT_SSTB_income[0],
+    PT_binc_w2_wages[0], PT_ubia_property[0], PT_qbid_rt, PT_qbid_limited,
     PT_qbid_taxinc_thd, PT_qbid_taxinc_gap, PT_qbid_w2_wages_rt,
     PT_qbid_alt_w2_wages_rt, PT_qbid_alt_property_rt, c04800[0],
     PT_qbid_ps, PT_qbid_prt, qbided[0])
@@ -597,8 +598,9 @@ expected0 = (490860.66, 0)
 tuple1 = (
     c00100[1], standard[1], c04470[1], c04600[1], MARS[1], e00900[1],
     c03260[1], e26270[1],
-    e02100[1], e27200[1], e00650[1], c01000[1], PT_SSTB_income[1],
-    PT_binc_w2_wages[1], PT_ubia_property[1], PT_qbid_rt,
+    e02100[1], e27200[1], e00650[1], c01000[1],
+    auto_loan_interest_deduction[1], PT_SSTB_income[1],
+    PT_binc_w2_wages[1], PT_ubia_property[1], PT_qbid_rt, PT_qbid_limited,
     PT_qbid_taxinc_thd, PT_qbid_taxinc_gap, PT_qbid_w2_wages_rt,
     PT_qbid_alt_w2_wages_rt, PT_qbid_alt_property_rt, c04800[1],
     PT_qbid_ps, PT_qbid_prt, qbided[1])
@@ -606,8 +608,9 @@ expected1 = (284400.08, 4275.02)
 tuple2 = (
     c00100[2], standard[2], c04470[2], c04600[2], MARS[2], e00900[2],
     c03260[2], e26270[2],
-    e02100[2], e27200[2], e00650[2], c01000[2], PT_SSTB_income[2],
-    PT_binc_w2_wages[2], PT_ubia_property[2], PT_qbid_rt,
+    e02100[2], e27200[2], e00650[2], c01000[2],
+    auto_loan_interest_deduction[2], PT_SSTB_income[2],
+    PT_binc_w2_wages[2], PT_ubia_property[2], PT_qbid_rt, PT_qbid_limited,
     PT_qbid_taxinc_thd, PT_qbid_taxinc_gap, PT_qbid_w2_wages_rt,
     PT_qbid_alt_w2_wages_rt, PT_qbid_alt_property_rt, c04800[2],
     PT_qbid_ps, PT_qbid_prt, qbided[2])
@@ -615,13 +618,13 @@ expected2 = (579300.00, 0)
 tuple3 = (
     c00100[3], standard[3], c04470[3], c04600[3], MARS[3], e00900[3],
     c03260[3], e26270[3],
-
-    e02100[3], e27200[3], e00650[3], c01000[3], PT_SSTB_income[3],
-    PT_binc_w2_wages[3], PT_ubia_property[3], PT_qbid_rt,
+    e02100[3], e27200[3], e00650[3], c01000[3],
+    auto_loan_interest_deduction[3], PT_SSTB_income[3],
+    PT_binc_w2_wages[3], PT_ubia_property[3], PT_qbid_rt, PT_qbid_limited,
     PT_qbid_taxinc_thd, PT_qbid_taxinc_gap, PT_qbid_w2_wages_rt,
     PT_qbid_alt_w2_wages_rt, PT_qbid_alt_property_rt, c04800[3],
     PT_qbid_ps, PT_qbid_prt, qbided[3])
-expected3 = (57500.00, 1200)
+expected3 = (56500.00, 1200)
 
 
 @pytest.mark.parametrize(
@@ -886,3 +889,77 @@ def test_AGI(test_tuple, expected_value, skip_jit):
     test_value = calcfunctions.AGI(*test_tuple)
     print('Returned from agi function: ', test_value)
     assert np.allclose(test_value, expected_value)
+
+
+# parameters for next test
+e03150 = 0
+e03210 = 0
+c03260 = 0
+e03270 = 0
+e03300 = 0
+e03400 = 0
+e03500 = 0
+e00800 = 0
+e03220 = 0
+e03230 = 0
+e03240 = 0
+e03290 = 0
+care_deduction = 0
+ALD_StudentLoan_hc = 0
+ALD_SelfEmp_HealthIns_hc = 0
+ALD_KEOGH_SEP_hc = 0
+ALD_EarlyWithdraw_hc = 0
+ALD_AlimonyPaid_hc = 0
+ALD_AlimonyReceived_hc = 0
+ALD_EducatorExpenses_hc = 0
+ALD_HSADeduction_hc = 0
+ALD_IRAContributions_hc = 0
+ALD_DomesticProduction_hc = 0
+ALD_Tuition_hc = 0
+MARS = 1
+earned = 200000
+overtime_income = 13000
+ALD_OvertimeIncome_hc = 0.
+ALD_OvertimeIncome_c = [12500, 25000, 12500, 12500, 12500]
+ALD_OvertimeIncome_ps = [150000, 300000, 150000, 150000, 150000]
+ALD_OvertimeIncome_prt = 0.10
+tip_income = 30000
+ALD_TipIncome_hc = 0.
+ALD_TipIncome_c = [25000, 25000, 25000, 25000, 25000]
+ALD_TipIncome_ps = [150000, 300000, 150000, 150000, 150000]
+ALD_TipIncome_prt = 0.10
+c02900 = 0  # calculated in function
+ALD_OvertimeIncome = 0  # calculated in function
+ALD_TipIncome = 0  # calculated in function
+
+tuple0 = (
+    e03150, e03210, c03260,
+    e03270, e03300, e03400, e03500, e00800,
+    e03220, e03230, e03240, e03290, care_deduction,
+    ALD_StudentLoan_hc, ALD_SelfEmp_HealthIns_hc, ALD_KEOGH_SEP_hc,
+    ALD_EarlyWithdraw_hc, ALD_AlimonyPaid_hc, ALD_AlimonyReceived_hc,
+    ALD_EducatorExpenses_hc, ALD_HSADeduction_hc, ALD_IRAContributions_hc,
+    ALD_DomesticProduction_hc, ALD_Tuition_hc,
+    MARS, earned,
+    overtime_income, ALD_OvertimeIncome_hc, ALD_OvertimeIncome_c,
+    ALD_OvertimeIncome_ps, ALD_OvertimeIncome_prt,
+    tip_income, ALD_TipIncome_hc, ALD_TipIncome_c,
+    ALD_TipIncome_ps, ALD_TipIncome_prt,
+    c02900, ALD_OvertimeIncome, ALD_TipIncome
+)
+ovr = 12500 - (200000 - 150000) * 0.10
+tip = 25000 - (200000 - 150000) * 0.10
+c02900 = 0 + ovr + tip
+expected0 = (c02900, ovr, tip)
+
+
+@pytest.mark.parametrize(
+    'test_tuple,expected_value', [(tuple0, expected0)]
+)
+def test_Adj(test_tuple, expected_value, skip_jit):
+    """
+    Tests the Adj function ALD_OvertimeIncome and ALD_TipIncome code
+    """
+    test_value = calcfunctions.Adj(*test_tuple)
+    print('Returned from Adj function: ', test_value)
+    assert np.allclose(test_value, expected_value)

taxcalc/tests/test_parameters.py

@@ -323,10 +323,17 @@ class ArrayParams(Parameters):
                         }
                     }
                 },
-                "idedtype": {
+                "EIC": {
                     "type": "str",
                     "validators": {
-                        "choice": {"choices": ["med", "sltx", "retx"]}
+                        "choice": {
+                            "choices": [
+                                "0kids",
+                                "1kid",
+                                "2kids",
+                                "3+kids"
+                            ]
+                        }
                     }
                 }
             },
@@ -344,23 +351,24 @@ class ArrayParams(Parameters):
             }
         },
         "one_dim": {
-            "title": "One dimension parameter",
+            "title": "One dimensional parameter",
             "description": "",
             "type": "float",
             "indexed": True,
             "indexable": True,
             "value": [{"year": 2013, "value": 5}]
         },
-        "two_dim": {
-            "title": "Two dimension parameter",
+        "EITC_c": {
+            "title": "Two dimensional parameter",
             "description": "",
             "type": "float",
             "indexed": True,
             "indexable": True,
             "value": [
-                {"year": 2013, "idedtype": "med", "value": 1},
-                {"year": 2013, "idedtype": "sltx", "value": 2},
-                {"year": 2013, "idedtype": "retx", "value": 3}
+                {"year": 2013, "EIC": "0kids", "value": 1},
+                {"year": 2013, "EIC": "1kid", "value": 2},
+                {"year": 2013, "EIC": "2kids", "value": 3},
+                {"year": 2013, "EIC": "3+kids", "value": 4}
             ]
         },
         "II_brk2": {
@@ -454,21 +462,21 @@ def test_expand_2d_short_array():
     """
     One of several _expand_?D tests.
     """
-    val = np.array([1., 2., 3.])
+    val = np.array([1., 2., 3., 4.])
     exp2 = np.array([val * math.pow(1.02, i) for i in range(1, 5)])
-    exp1 = np.array([1., 2., 3.])
-    exp = np.zeros((5, 3))
+    exp1 = np.array([1., 2., 3., 4.])
+    exp = np.zeros((5, 4))
     exp[:1] = exp1
     exp[1:] = exp2
 
     params = ArrayParams(array_first=False, label_to_extend=None)
     years = [2013, 2014, 2015, 2016, 2017]
     params.extend(
-        params=["two_dim"],
+        params=["EITC_c"],
         label="year",
         label_values=years,
     )
-    res = params.to_array("two_dim", year=years)
+    res = params.to_array("EITC_c", year=years)
     assert np.allclose(exp, res, atol=0.01, rtol=0.0)
 
 
@@ -476,8 +484,8 @@ def test_expand_2d_variable_rates():
     """
     One of several _expand_?D tests.
     """
-    ary = np.array([[1., 2., 3.]])
-    cur = np.array([1., 2., 3.])
+    ary = np.array([[1., 2., 3., 4.]])
+    cur = np.array([1., 2., 3., 4.])
     irates = [0.02, 0.02, 0.02, 0.03, 0.035]
     exp2 = []
     for i in range(0, 4):
@@ -485,16 +493,16 @@ def test_expand_2d_variable_rates():
         cur = np.array(cur * (1.0 + irates[idx]))
         print('cur is ', cur)
         exp2.append(cur)
-    exp1 = np.array([1., 2., 3.])
-    exp = np.zeros((5, 3))
+    exp1 = np.array([1., 2., 3., 4.])
+    exp = np.zeros((5, 4))
     exp[:1] = exp1
     exp[1:] = exp2
 
     params = ArrayParams(array_first=False, label_to_extend=None)
     params._inflation_rates = irates
     years = [2013, 2014, 2015, 2016, 2017]
-    params.extend(params=["two_dim"], label="year", label_values=years)
-    res = params.to_array("two_dim", year=years)
+    params.extend(params=["EITC_c"], label="year", label_values=years)
+    res = params.to_array("EITC_c", year=years)
     assert np.allclose(exp, res, atol=0.01, rtol=0.0)
 
 

taxcalc/tests/test_policy.py

@@ -701,7 +701,7 @@ def test_section_titles(tests_path):
             cgqd_tax_same: 0
         },
         'Personal Income': {
-            'Regular: Non-AMT, Non-Pass-Through': 0,
+            'Regular: Non-AMT': 0,
             'Pass-Through': 0,
             'Alternative Minimum Tax': 0
         },

{taxcalc-5.0.0.dist-info → taxcalc-5.0.4.dist-info}/METADATA

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

{taxcalc-5.0.0.dist-info → taxcalc-5.0.4.dist-info}/RECORD

@@ -1,24 +1,24 @@
-taxcalc/__init__.py,sha256=8ZPmhDabuQcT5NOpKql7aJ7-l7GpLYovbyvTN8Ya5qk,536
-taxcalc/calcfunctions.py,sha256=k0p_w-IpHAeOBxqjAM-sFBl1Q7NqAOx3S6W_KB0vmgE,131393
-taxcalc/calculator.py,sha256=oXx_IRv0jbfXEFQZkg_E3DzuHJ1JP4kBE8YdbE04iA4,64079
+taxcalc/__init__.py,sha256=IYwOoMZnXFQN_dE2QawoaMF8n0DDN3PawRou9l9Xn6A,536
+taxcalc/calcfunctions.py,sha256=dzq0-HmNh9OO024z7tPelbYm07T1Uqksajvk2o-fukk,132371
+taxcalc/calculator.py,sha256=6FZ0Y1BjxGjvyx4X-z1tTNfWKgdVczchk7K6RS_4ikk,64159
 taxcalc/conftest.py,sha256=nO4J7qu1sTHgjqrzhpRMvfMJUrNm6GP_IsSuuDt_MeQ,141
-taxcalc/consumption.json,sha256=FBgDd72AZnviQRhGz5rPgpGpOmaOzNYfGB9GdTCeKPI,8102
+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/growdiff.json,sha256=ReBAF6We9ZwTb0uDYQwbedPsQKdm6KSOERiddEYZbm0,15037
+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/parameters.py,sha256=vvweNfZ7GGI6cdi9yxsZLaLdonIIzbhjUp5NsBSkC84,35978
-taxcalc/policy.py,sha256=O75xwWsQt49aUte0fhIaLpORwjQj865gP9Bl8IpHIQQ,8408
-taxcalc/policy_current_law.json,sha256=tt4KyUyxXBmuQ4cvMcMf8xRGsb6Rvf0VvhxSMIQFmjg,590018
+taxcalc/parameters.py,sha256=ObwQMBlPjq3tyNwiR94Nj0zouIVsNaHIho-OQK1RNKg,35966
+taxcalc/policy.py,sha256=x_CL_okaGW5Tr_O4aDHvzaxjkPtqcaF91MHR70gHMq4,8809
+taxcalc/policy_current_law.json,sha256=dbikS1nr6MqjrDuw6lCn7cT3xFbPeNcqR3ZnOFuzsrY,607611
 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=M4XMBpaolosMzY9cFKLFQxE2RYqPVKJuVHDX8AfVy9c,41362
+taxcalc/records.py,sha256=zz-q7rNFUBqDLaDYjcScfwf22zzSw-XEew00HGWB0Ho,18397
+taxcalc/records_variables.json,sha256=8CPtJ8C5BMIciidH4mPUim2CmA6anYlcHoA9BWT5jUo,42514
 taxcalc/taxcalcio.py,sha256=_ylnC-dZUpDFn79F8pjkZEq-wJhPCQA7Ig9SRLyhrUA,37691
 taxcalc/utils.py,sha256=Wsvni2UP7WgnByN4bRIiLGgamDFwfQoexiy420o6ewY,63666
 taxcalc/utilsprvt.py,sha256=iIyWp9-N3_XWjQj2jV2CWnJy7vrNlKB2_vIMwYjgbWY,1323
@@ -29,7 +29,7 @@ taxcalc/cli/__init__.py,sha256=cyZ0tdx41j_vV_B6GAkqJmNKKG-B0wUC0ThC75lJlk4,104
 taxcalc/cli/tc.py,sha256=hGkP-XHkvx0MoFdHf-BjUnKqAxQBRtk8Vv4uqtIGuRY,18760
 taxcalc/reforms/2017_law.json,sha256=SglDU_h4Ol8sBi92B8T-ToOF1eDbp-5WtLrYNIIYkEk,5188
 taxcalc/reforms/2017_law.out.csv,sha256=nnNKXqY2kof8HC1nnU8srPsvNNepi6ISXQ9OJpQnT7M,473
-taxcalc/reforms/ARPA.json,sha256=1H9LuJ_QitXRO9e8R3PWizajJgdioIzbGFdvdlt9FVg,3119
+taxcalc/reforms/ARPA.json,sha256=6oGn3pZ4clAhjFHvqpmm7sXcm407Ea_8mjJchSscKpc,3203
 taxcalc/reforms/ARPA.out.csv,sha256=qSUdI0LoQFGG6h24eT-249pLEqmxmt7TvLrv1HX_y3Y,475
 taxcalc/reforms/BrownKhanna.json,sha256=yydcFsixV28p1I5uB0VgwJJ5GyGL0JU8K-IUwrPHlzs,964
 taxcalc/reforms/BrownKhanna.out.csv,sha256=D2pPxtH5RyMnf8wQad3R2W1Uh4ZLXa7MAQ_dQccMkPA,475
@@ -81,11 +81,11 @@ taxcalc/tests/puf_var_correl_coeffs_2016.csv,sha256=2VtWUcTaE6c5cmmEDylv9XKVONLT
 taxcalc/tests/puf_var_wght_means_by_year.csv,sha256=nou_pIKICyXmCfyj_UziNXp1EB4BQU7Qa-ZvqlE1WqM,20049
 taxcalc/tests/pufcsv_agg_expect.csv,sha256=n3fmYQtpv7RClTyGsJ4ehFJzFexQA4Lp1jrbAuBcEK8,2117
 taxcalc/tests/pufcsv_mtr_expect.txt,sha256=xGsUfafzsZ04fFQw162ys-1Mf1CDC_PQ0QZNigS07VY,4265
-taxcalc/tests/reforms.json,sha256=5-Dl4t00F747RPuagHQBD8KlzWFu4b9x-DW1LajHoZ0,17094
+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/test_benefits.py,sha256=oaui5mO0TuW8Ht-uxvUCBL5zM3iTENq3Whyf_gEpY1U,3392
-taxcalc/tests/test_calcfunctions.py,sha256=512XEGEh2uT2si1eE2S5HP93ewj8dXLGGoDhi9Mqzbo,31949
+taxcalc/tests/test_calcfunctions.py,sha256=l6uzU1sToOhVOSKrjQMGJ3j4GNTdGgo0JDFrza7-nlw,34269
 taxcalc/tests/test_calculator.py,sha256=JTbaQ9rndIB7WylQE4inLvd7CazH4Vdnb0h7IRDtN3Q,33653
 taxcalc/tests/test_compare.py,sha256=WglH4ZJOEQnav_mAmnGjpb7dooXcQsB1m04hgQeoBUQ,10873
 taxcalc/tests/test_compatible_data.py,sha256=MP-DZXrBJ_2ftuxHchl3EGOhPnP5pnnrSQOM9POSx0c,13224
@@ -95,8 +95,8 @@ 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=og-vbgGLb1Gow2xBjo9wy9nHNjFzrzmhOMw7ZeaNIJE,20132
-taxcalc/tests/test_policy.py,sha256=Y8hqQBwOI4-qIgmP-70402fZ17Mm4OGkx8sxnZXxT4I,55565
+taxcalc/tests/test_parameters.py,sha256=G5mTb2ZQksVGEv8MoO2Fwt12ZJYzk7_-yGT-A-fhBkM,20420
+taxcalc/tests/test_policy.py,sha256=B0Zple7HXAfi0ZhIyJhst05WB5DH60qoHyaIRR_Ar0Q,55547
 taxcalc/tests/test_puf_var_stats.py,sha256=TG-sQtOkR6cBOw0am7MUsMSwjPxVdkvt0Xov342oii8,7786
 taxcalc/tests/test_pufcsv.py,sha256=rxPaxA-SCAwaLy3jSnplvy_3dH8MQ-UKDSJnYZNhjzo,14434
 taxcalc/tests/test_records.py,sha256=ncswnbCY7vZgJ_h6xwql4oFw-jZG2gWOMWvEJC2_jdc,8827
@@ -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-5.0.0.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
-taxcalc-5.0.0.dist-info/METADATA,sha256=BlYQjYi7q_EggN2BVILeMue5JuP7YJuBm5GPx_mIRp0,3677
-taxcalc-5.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-taxcalc-5.0.0.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
-taxcalc-5.0.0.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
-taxcalc-5.0.0.dist-info/RECORD,,
+taxcalc-5.0.4.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
+taxcalc-5.0.4.dist-info/METADATA,sha256=AHnmkhxWqvjOpjHD5pJqTGY8sV7BNoc3UQuQc9_X0FQ,3677
+taxcalc-5.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+taxcalc-5.0.4.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
+taxcalc-5.0.4.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
+taxcalc-5.0.4.dist-info/RECORD,,