Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove taxcalc-related variable aliases #3233

Merged
merged 45 commits into from
Nov 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1a3f979
Remove unused c11070 alias
martinholmer Nov 4, 2023
5a0b1b4
Remove c07230 alias
martinholmer Nov 4, 2023
234dd1d
Remove unused c10960 alias
martinholmer Nov 4, 2023
f155b35
Remove unused c87668 alias
martinholmer Nov 4, 2023
84e42de
Remove unused c07200 alias
martinholmer Nov 4, 2023
e77c131
Remove unused c07100 alias
martinholmer Nov 4, 2023
99efe96
Remove unused rptc alias
martinholmer Nov 4, 2023
2342c0d
Remove unused c59660 alias
martinholmer Nov 4, 2023
8e8b218
Rename variable e07240 to retirement_savings_credit
martinholmer Nov 4, 2023
05853e5
Rename iitax variable to income_tax and remove unneeded alias
martinholmer Nov 4, 2023
4389c91
Eliminate the mars alias for the filing_status variable
martinholmer Nov 4, 2023
b6ce1c4
Rename earned_income_tax_credit to eitc to be consistent with other c…
martinholmer Nov 4, 2023
c3e1916
Revise winship reform/tests to use eitc
martinholmer Nov 4, 2023
9f50b18
Revise nyc_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
bdddfa2
Rename earned_income_tax_credit.py to eitc.py
martinholmer Nov 4, 2023
68f9403
Revise NY EITC formulas/tests to use eitc
martinholmer Nov 4, 2023
0e3d6f1
Revise vt_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
8ffb510
Revise sc_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
4850ced
Revise wi_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
f376676
Revise ri_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
c417c91
Revise or_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
25f5d4d
Revise OR subtraction to use eitc
martinholmer Nov 4, 2023
8bb7a00
Revise ne_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
cc99898
Revise ne_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
e6cdeed
Revise mt_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
9397501
Revise mo_wftc formula/tests to use eitc
martinholmer Nov 4, 2023
f305fdd
Revise mi_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
e1b2147
Revise me_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
f1f1aec
Revise md eitc formula to use eitc
martinholmer Nov 4, 2023
aa5eda4
Revise ma_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
e8ab08e
Revise la_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
56e29ba
Revise ks_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
8e39100
Revise in_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
8059bee
Revise il_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
a8d7673
Revise ia_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
41e0a66
Revise hi_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
e43ec07
Revise DE eitc formulas/tests to use eitc
martinholmer Nov 4, 2023
fe28d70
Revise DC eitc formula/tests to use eitc
martinholmer Nov 4, 2023
86cee4d
Revise ct_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
eb0b670
Revise co_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
8472777
Revise ok_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
30e4e5d
Revise ca_eitc tests to use eitc
martinholmer Nov 4, 2023
93dbd0f
Revise oh_eitc formula/tests to use eitc
martinholmer Nov 4, 2023
e2f8484
Revise nj_eitc tests to use eitc
martinholmer Nov 4, 2023
6755528
Add changelog entry
martinholmer Nov 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog_entry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- bump: patch
changes:
fixed:
- Remove obsolete taxcalc-related alias variable names.
- Rename `earned_income_tax_credit` to `eitc` to be more consistent with variable names for other federal credits.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
description: Ignored credits in MO federal income tax deduction calculations.
values:
2018-01-01:
- earned_income_tax_credit
- eitc
- recovery_rebate_credit
metadata:
unit: variable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ values:
- ssi
- state_supplement # state SSI supplement
- general_assistance
- earned_income_tax_credit
- eitc

metadata:
label: Oklahoma sales tax credit gross income sources
Expand Down
4 changes: 2 additions & 2 deletions policyengine_us/reforms/winship.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def formula(tax_unit, period, parameters):
limitation = max_(0, maximum - reduction)
return min_(phased_in, limitation)

class earned_income_tax_credit(Variable):
class eitc(Variable):
value_type = float
entity = TaxUnit
definition_period = YEAR
Expand Down Expand Up @@ -75,7 +75,7 @@ def formula(tax_unit, period, parameters):
class winship_eitc_reform(Reform):
def apply(self):
self.add_variable(original_eitc)
self.update_variable(earned_income_tax_credit)
self.update_variable(eitc)

return winship_eitc_reform

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: Defaults to zero
period: 2020
output:
c07230: 0
education_tax_credits: 0

- name: Sums non-refundable American Opportunity Credit and Lifetime Learning Credit
period: 2020
input:
non_refundable_american_opportunity_credit: 1
lifetime_learning_credit: 1
output:
c07230: 2
education_tax_credits: 2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
input:
state_code: NY
in_nyc: true
earned_income_tax_credit: 100
eitc: 100
ny_agi: 18_000
output:
# NYC EIC rate worksheet
Expand Down Expand Up @@ -39,7 +39,7 @@
input:
state_code: NY
in_nyc: true
earned_income_tax_credit: 100
eitc: 100
ny_agi: 21_000
output:
# NYC EIC rate worksheet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
state_code: CA
output: # expected results from patched TAXSIM35 2023-02-22 version
# expected US results:
earned_income_tax_credit: 0 # too much investment income to be eligible
eitc: 0 # too much investment income to be eligible
income_tax: -9648
# expected CA results:
ca_income_tax_before_credits: 164.14 # this is a PolicyEngineUS output
Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
- name: co_eitc unit test 1
period: 2021
input:
earned_income_tax_credit: 100
eitc: 100
state_code: CO
output:
co_eitc: 10

- name: co_eitc unit test 2
period: 2022
input:
earned_income_tax_credit: 100
eitc: 100
state_code: CO
output:
co_eitc: 20

- name: co_eitc unit test 3
period: 2023
input:
earned_income_tax_credit: 100
eitc: 100
state_code: CO
output:
co_eitc: 25

- name: co_eitc unit test 4
period: 2023
input:
earned_income_tax_credit: 0
eitc: 0
state_code: CO
output:
co_eitc: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
period: 2022
input:
state_code: CT
earned_income_tax_credit: 0
eitc: 0
output:
ct_eitc: 0

- name: CT EITC, some matched credit and regular filing
period: 2022
input:
state_code: CT
earned_income_tax_credit: 2_000
eitc: 2_000
output:
ct_eitc: 610
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
period: 2023
input:
state_code: DC
earned_income_tax_credit: 0
eitc: 0
output:
dc_eitc_with_qualifying_child: 0

- name: 70% match
period: 2023
input:
state_code: DC
earned_income_tax_credit: 100
eitc: 100
output:
dc_eitc_with_qualifying_child: 70
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
period: 2022
input:
state_code: DE
earned_income_tax_credit: 0
eitc: 0
output:
de_non_refundable_eitc_if_claimed: 0

- name: Non refundable rate of 20%
period: 2022
input:
state_code: DE
earned_income_tax_credit: 1_000
eitc: 1_000
output:
de_non_refundable_eitc_if_claimed: 200
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
period: 2022
input:
state_code: DE
earned_income_tax_credit: 1_000
eitc: 1_000
output:
de_refundable_eitc_if_claimed: 45

- name: No EITC
period: 2022
input:
state_code: DE
earned_income_tax_credit: 0
eitc: 0
output:
de_refundable_eitc_if_claimed: 0
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- name: No EITC
period: 2022
input:
earned_income_tax_credit: 0
eitc: 0
state_code: HI
output:
hi_eitc: 0

- name: 20% match of fed EITC
period: 2022
input:
earned_income_tax_credit: 1_000
eitc: 1_000
state_code: HI
output:
hi_eitc: 200
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: IA eitc unit test 1
period: 2021
input:
earned_income_tax_credit: 1_000
eitc: 1_000
state_code: IA
output:
ia_eitc: 150
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
period: 2021
absolute_error_margin: 0.0001
input:
earned_income_tax_credit: 1_000
eitc: 1_000
state_code: IL
output:
il_eitc: 1_000 * 0.18
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
input:
gov.states.in.tax.income.credits.earned_income.decoupled: false
state_code: IN
earned_income_tax_credit: 100
eitc: 100
in_eitc_eligible: true
output:
in_eitc: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
input:
gov.states.in.tax.income.credits.earned_income.decoupled: true
state_code: IN
earned_income_tax_credit: 999
eitc: 999
filing_status: SINGLE
eitc_child_count: 0
age_head: 64
Expand All @@ -16,7 +16,7 @@
input:
gov.states.in.tax.income.credits.earned_income.decoupled: true
state_code: IN
earned_income_tax_credit: 999
eitc: 999
filing_status: SEPARATE
eitc_child_count: 0
age_head: 64
Expand All @@ -29,7 +29,7 @@
input:
gov.states.in.tax.income.credits.earned_income.decoupled: true
state_code: IN
earned_income_tax_credit: 999
eitc: 999
filing_status: SINGLE
eitc_child_count: 0
age_head: 65
Expand All @@ -42,7 +42,7 @@
input:
gov.states.in.tax.income.credits.earned_income.decoupled: true
state_code: IN
earned_income_tax_credit: 999
eitc: 999
filing_status: SINGLE
eitc_child_count: 0
age_head: 64
Expand All @@ -55,7 +55,7 @@
input:
gov.states.in.tax.income.credits.earned_income.decoupled: true
state_code: IN
earned_income_tax_credit: 0
eitc: 0
filing_status: SINGLE
eitc_child_count: 0
age_head: 64
Expand All @@ -68,7 +68,7 @@
input:
gov.states.in.tax.income.credits.earned_income.decoupled: false
state_code: IN
earned_income_tax_credit: 999
eitc: 999
filing_status: SEPARATE
eitc_child_count: 0
age_head: 65
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: KS total eitc unit test
period: 2021
input:
earned_income_tax_credit: 1_000
eitc: 1_000
state_code: KS
output:
ks_total_eitc: 0.17 * 1_000
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- name: 5% of federal EITC after 2019.
period: 2023
input:
earned_income_tax_credit: 100
eitc: 100
state_code: LA
output:
la_eitc: 5

- name: If no federal EITC, no Louisiana EITC.
period: 2023
input:
earned_income_tax_credit: 0
eitc: 0
state_code: LA
output:
la_eitc: 0
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
absolute_error_margin: 1
input:
state_code: MA
earned_income_tax_credit: 0
eitc: 0
output:
ma_eitc: 0

Expand All @@ -12,6 +12,6 @@
absolute_error_margin: 1
input:
state_code: MA
earned_income_tax_credit: 100
eitc: 100
output:
ma_eitc: 30
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
tax_units:
tax_unit:
members: [person1, person2]
earned_income_tax_credit: 0
eitc: 0
households:
household:
members: [person1, person2]
Expand All @@ -30,7 +30,7 @@
tax_units:
tax_unit:
members: [person1, person2]
earned_income_tax_credit: 500
eitc: 500
households:
household:
members: [person1, person2]
Expand All @@ -50,7 +50,7 @@
tax_units:
tax_unit:
members: [person1, person2]
earned_income_tax_credit: 500
eitc: 500
households:
household:
members: [person1, person2]
Expand All @@ -70,7 +70,7 @@
tax_units:
tax_unit:
members: [person1, person2]
earned_income_tax_credit: 500
eitc: 500
households:
household:
members: [person1, person2]
Expand All @@ -92,7 +92,7 @@
tax_units:
tax_unit:
members: [person1, person2, person3]
earned_income_tax_credit: 500
eitc: 500
households:
household:
members: [person1, person2, person3]
Expand Down
Loading