taxcalc 5.0.0__py3-none-any.whl → 5.1.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- taxcalc/__init__.py +1 -1
- taxcalc/calcfunctions.py +364 -276
- taxcalc/calculator.py +4 -3
- taxcalc/consumption.json +0 -16
- taxcalc/growdiff.json +2 -18
- taxcalc/parameters.py +1 -1
- taxcalc/policy.py +15 -2
- taxcalc/policy_current_law.json +1011 -85
- taxcalc/records.py +3 -0
- taxcalc/records_variables.json +40 -1
- taxcalc/reforms/2017_law.json +1 -1
- taxcalc/reforms/ARPA.json +6 -6
- taxcalc/reforms/CARES.json +2 -2
- taxcalc/reforms/TCJA.json +1 -1
- taxcalc/reforms/ext.json +1 -1
- taxcalc/tests/cpscsv_agg_expect.csv +6 -6
- taxcalc/tests/puf_var_correl_coeffs_2016.csv +10 -10
- taxcalc/tests/puf_var_wght_means_by_year.csv +5 -5
- taxcalc/tests/pufcsv_agg_expect.csv +8 -8
- taxcalc/tests/pufcsv_mtr_expect.txt +18 -18
- taxcalc/tests/reforms.json +1 -1
- taxcalc/tests/test_calcfunctions.py +113 -29
- taxcalc/tests/test_parameters.py +27 -19
- taxcalc/tests/test_policy.py +1 -1
- taxcalc/tests/test_reforms.py +1 -1
- {taxcalc-5.0.0.dist-info → taxcalc-5.1.0.dist-info}/METADATA +1 -1
- {taxcalc-5.0.0.dist-info → taxcalc-5.1.0.dist-info}/RECORD +31 -31
- {taxcalc-5.0.0.dist-info → taxcalc-5.1.0.dist-info}/WHEEL +0 -0
- {taxcalc-5.0.0.dist-info → taxcalc-5.1.0.dist-info}/entry_points.txt +0 -0
- {taxcalc-5.0.0.dist-info → taxcalc-5.1.0.dist-info}/licenses/LICENSE +0 -0
- {taxcalc-5.0.0.dist-info → taxcalc-5.1.0.dist-info}/top_level.txt +0 -0
taxcalc/calculator.py
CHANGED
@@ -14,9 +14,9 @@ import paramtools
|
|
14
14
|
from taxcalc.calcfunctions import (TaxInc, SchXYZTax, GainsTax, AGIsurtax,
|
15
15
|
NetInvIncTax, AMT, EI_PayrollTax, Adj,
|
16
16
|
DependentCare, ALD_InvInc_ec_base, CapGains,
|
17
|
-
SSBenefits, UBI, AGI,
|
18
|
-
StdDed, AdditionalMedicareTax,
|
19
|
-
RefundablePayrollTaxCredit,
|
17
|
+
SSBenefits, UBI, AGI, MiscDed,
|
18
|
+
ItemDed, StdDed, AdditionalMedicareTax,
|
19
|
+
F2441, EITC, RefundablePayrollTaxCredit,
|
20
20
|
ChildDepTaxCredit, AdditionalCTC, CTC_new,
|
21
21
|
PersonalTaxCredit, SchR,
|
22
22
|
AmOppCreditParts, EducationTaxCredit,
|
@@ -1391,6 +1391,7 @@ class Calculator():
|
|
1391
1391
|
CapGains(self.__policy, self.__records)
|
1392
1392
|
SSBenefits(self.__policy, self.__records)
|
1393
1393
|
AGI(self.__policy, self.__records)
|
1394
|
+
MiscDed(self.__policy, self.__records)
|
1394
1395
|
ItemDed(self.__policy, self.__records)
|
1395
1396
|
AdditionalMedicareTax(self.__policy, self.__records)
|
1396
1397
|
StdDed(self.__policy, self.__records)
|
taxcalc/consumption.json
CHANGED
@@ -24,22 +24,6 @@
|
|
24
24
|
}
|
25
25
|
}
|
26
26
|
},
|
27
|
-
"idedtype": {
|
28
|
-
"type": "str",
|
29
|
-
"validators": {
|
30
|
-
"choice": {
|
31
|
-
"choices": [
|
32
|
-
"med",
|
33
|
-
"sltx",
|
34
|
-
"retx",
|
35
|
-
"cas",
|
36
|
-
"misc",
|
37
|
-
"int",
|
38
|
-
"char"
|
39
|
-
]
|
40
|
-
}
|
41
|
-
}
|
42
|
-
},
|
43
27
|
"EIC": {
|
44
28
|
"type": "str",
|
45
29
|
"validators": {
|
taxcalc/growdiff.json
CHANGED
@@ -24,22 +24,6 @@
|
|
24
24
|
}
|
25
25
|
}
|
26
26
|
},
|
27
|
-
"idedtype": {
|
28
|
-
"type": "str",
|
29
|
-
"validators": {
|
30
|
-
"choice": {
|
31
|
-
"choices": [
|
32
|
-
"med",
|
33
|
-
"sltx",
|
34
|
-
"retx",
|
35
|
-
"cas",
|
36
|
-
"misc",
|
37
|
-
"int",
|
38
|
-
"char"
|
39
|
-
]
|
40
|
-
}
|
41
|
-
}
|
42
|
-
},
|
43
27
|
"EIC": {
|
44
28
|
"type": "str",
|
45
29
|
"validators": {
|
@@ -298,7 +282,7 @@
|
|
298
282
|
},
|
299
283
|
"ATXPY": {
|
300
284
|
"title": "ATXPY additive difference from default projection",
|
301
|
-
"description": "Default projection is in growfactors.csv file. ATXPY extrapolates input variables: e00700, e00800, e01400, e01500, e01700, e03150, e03210, e03220, e03230, e03300, e03400, e03500, e07240, e07260, p08000, e09700, e09800, e09900, e11200, e18400, e18500, e19800, e20100, e20400, g20500, e07600, e32800, e58990, e62900, e87530, e87521 and
|
285
|
+
"description": "Default projection is in growfactors.csv file. ATXPY extrapolates input variables: e00700, e00800, e01400, e01500, e01700, e03150, e03210, e03220, e03230, e03300, e03400, e03500, e07240, e07260, p08000, e09700, e09800, e09900, e11200, e18400, e18500, e19800, e20100, e20400, g20500, e07600, e32800, e58990, e62900, e87530, e87521, cmbtp, and auto_loan_interest.",
|
302
286
|
"type": "float",
|
303
287
|
"value": [
|
304
288
|
{
|
@@ -332,7 +316,7 @@
|
|
332
316
|
},
|
333
317
|
"AWAGE": {
|
334
318
|
"title": "AWAGE additive difference from default projection",
|
335
|
-
"description": "Default projection is in growfactors.csv file. AWAGE extrapolates input variables: e00200, e00200p and
|
319
|
+
"description": "Default projection is in growfactors.csv file. AWAGE extrapolates input variables: e00200, e00200p, e00200s, overtime_income, and tip_income. Also, AWAGE is the wage growth rate used to inflate the OASDI maximum taxable earnings policy parameter, _SS_Earnings_c. Note that non-zero values of this parameter will not affect historically known values of _SS_Earnings_c.",
|
336
320
|
"type": "float",
|
337
321
|
"value": [
|
338
322
|
{
|
taxcalc/parameters.py
CHANGED
@@ -840,7 +840,7 @@ class Parameters(paramtools.Parameters):
|
|
840
840
|
vvalue = None
|
841
841
|
if len(extend_vo) > 2:
|
842
842
|
extend_vo_keys = extend_vo.keys()
|
843
|
-
vo_labels = ['MARS', 'EIC'
|
843
|
+
vo_labels = ['MARS', 'EIC']
|
844
844
|
for vo_label in vo_labels:
|
845
845
|
if vo_label in extend_vo_keys:
|
846
846
|
vlabel = vo_label
|
taxcalc/policy.py
CHANGED
@@ -61,7 +61,7 @@ class Policy(Parameters):
|
|
61
61
|
# following parameters were renamed in PR 2918
|
62
62
|
'SS_thd50': 'was renamed SS_thd1 in Tax-Calculator 5.0.0',
|
63
63
|
'SS_thd85': 'was renamed SS_thd2 in Tax-Calculator 5.0.0',
|
64
|
-
# following parameters were removed in PR
|
64
|
+
# following parameters were removed in PR 2919
|
65
65
|
'PT_rt1': 'was removed in Tax-Calculator 5.0.0',
|
66
66
|
'PT_rt2': 'was removed in Tax-Calculator 5.0.0',
|
67
67
|
'PT_rt3': 'was removed in Tax-Calculator 5.0.0',
|
@@ -81,7 +81,7 @@ class Policy(Parameters):
|
|
81
81
|
'PT_EligibleRate_passive': 'was removed in Tax-Calculator 5.0.0',
|
82
82
|
'PT_wages_active_income': 'was removed in Tax-Calculator 5.0.0',
|
83
83
|
'PT_top_stacking': 'was removed in Tax-Calculator 5.0.0',
|
84
|
-
# following parameters were removed in PR
|
84
|
+
# following parameters were removed in PR 2920
|
85
85
|
'ID_AmountCap_Switch': 'was removed in Tax-Calculator 5.0.0',
|
86
86
|
'ID_AmountCap_rt': 'was removed in Tax-Calculator 5.0.0',
|
87
87
|
'ID_BenefitCap_Switch': 'was removed in Tax-Calculator 5.0.0',
|
@@ -90,6 +90,19 @@ class Policy(Parameters):
|
|
90
90
|
'ID_BenefitSurtax_crt': 'was removed in Tax-Calculator 5.0.0',
|
91
91
|
'ID_BenefitSurtax_trt': 'was removed in Tax-Calculator 5.0.0',
|
92
92
|
'ID_BenefitSurtax_em': 'was removed in Tax-Calculator 5.0.0',
|
93
|
+
# following parameters were renamed in PR 2928
|
94
|
+
'CDCC_ps': 'was renamed CDCC_ps1 in Tax-Calculator 5.1.0',
|
95
|
+
'CDCC_crt': 'was renamed CDCC_po1_rate_max in Tax-Calculator 5.1.0',
|
96
|
+
'CDCC_frt': 'was renamed CDCC_po1_rate_min in Tax-Calculator 5.1.0',
|
97
|
+
'CDCC_po_step_size': (
|
98
|
+
'was renamed CDCC_po1_step_size in Tax-Calculator 5.1.0'
|
99
|
+
),
|
100
|
+
# following parameter was renamed in PR 2929
|
101
|
+
'II_prt': 'was renamed II_em_prt in Tax-Calculator 5.1.0',
|
102
|
+
# following parameter was renamed in PR 2932
|
103
|
+
'ID_Charity_crt_cash': (
|
104
|
+
'was renamed ID_Charity_crt_all in Tax-Calculator 5.1.0'
|
105
|
+
),
|
93
106
|
}
|
94
107
|
# (2) specify which Policy parameters have been redefined recently
|
95
108
|
# where "recently" means in the last major release
|