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

Rename WIDOW to SURVIVING_SPOUSE filing status #4130

Merged
merged 26 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cf15639
updates
JudyZ13 Mar 4, 2024
6150b36
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 5, 2024
060dc49
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 7, 2024
334b4f5
updates
JudyZ13 Mar 7, 2024
10edf3f
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 11, 2024
fc93e46
Rename `WIDOW` to `SURVIVING_SPOUSE` filing status
JudyZ13 Mar 11, 2024
f77c35e
updates to 'hi'
JudyZ13 Mar 11, 2024
c41befd
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 13, 2024
b8a6ab7
updates
JudyZ13 Mar 13, 2024
ea0df08
updates
JudyZ13 Mar 13, 2024
18dd28b
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 14, 2024
023ff0f
updates
JudyZ13 Mar 14, 2024
97439f6
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 19, 2024
ad649fa
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 19, 2024
5291b08
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 19, 2024
0fda3d9
Co-authored-by: Pavel Makarchuk <PavelMakarchuk@users.noreply.github.…
JudyZ13 Mar 19, 2024
c863139
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 21, 2024
5d8ea34
updates
JudyZ13 Mar 26, 2024
d051bc1
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 26, 2024
bee6070
fixed errors
JudyZ13 Mar 28, 2024
4126e00
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Mar 28, 2024
8f77c5e
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
JudyZ13 Apr 2, 2024
d47de0e
revert some changes
JudyZ13 Apr 2, 2024
eb3794d
revert minor
PavelMakarchuk Apr 2, 2024
ad8af12
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
PavelMakarchuk Apr 2, 2024
b109c18
Update policyengine_us/variables/household/demographic/tax_unit/filin…
MaxGhenis Apr 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ One common breakdown is to break down by **`filing_status`**. If you decided to

* `SINGLE`
* `SEPARATE`
* `WIDOW`
* `SURVIVING_SPOUSE`
* `HEAD_OF_HOUSEHOLD`
* `JOINT`

Sometimes, the document that you refer to (e.g. tax instruction) does not specify all five statuses. In that case, you can let the `WIDOW` cases to be the same as the `JOINT` case.
Sometimes, the document that you refer to (e.g. tax instruction) does not specify all five statuses. In that case, you can let the `SURVIVING_SPOUSE` cases to be the same as the `JOINT` case.

PolicyEngine defines parameters as yaml files, which specify the values as of certain dates, as well as metadata on the units and reference(s).

Expand Down
4 changes: 4 additions & 0 deletions changelog_entry.yaml
JudyZ13 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- bump: minor
changes:
added:
- Rename widow to surviving spouse.
4 changes: 3 additions & 1 deletion policyengine_us/data/datasets/cps/enhanced_cps/loss.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,9 @@ def generate_model_variables(
# Tax return counts by filing status

filing_status = (
simulation.calculate("filing_status").replace("WIDOW", "JOINT").values
simulation.calculate("filing_status")
.replace("SURVIVING_SPOUSE", "JOINT")
.values
)
for filing_status_value in [
"SINGLE",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ SEPARATE:
2020-01-01: 0
HEAD_OF_HOUSEHOLD:
2020-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
2020-01-01: 0
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ SEPARATE:
2020-01-01: 0
HEAD_OF_HOUSEHOLD:
2020-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
2020-01-01: 0
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ JOINT:
2000-01-01: 0
metadata:
label: WFTCA joint filer amount
WIDOW:
SURVIVING_SPOUSE:
values:
2000-01-01: 0
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ JOINT:
2000-01-01: 0
metadata:
label: WFTCA joint filer phase-out threshold
WIDOW:
SURVIVING_SPOUSE:
values:
2000-01-01: 0
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SEPARATE:
2000-01-01: 0
HEAD_OF_HOUSEHOLD:
2000-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
2000-01-01: 0
metadata:
breakdown: filing_status
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HEAD_OF_HOUSEHOLD:
0000-01-01: 0
SEPARATE:
0000-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 0
metadata:
unit: currency-USD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HEAD_OF_HOUSEHOLD:
0000-01-01: 0
SEPARATE:
0000-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 0
metadata:
unit: currency-USD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HEAD_OF_HOUSEHOLD:
0000-01-01: 0
SEPARATE:
0000-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 0
metadata:
unit: currency-USD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ SEPARATE:
2010-01-01: 1_500
HEAD_OF_HOUSEHOLD:
2010-01-01: 3_000
WIDOW:
SURVIVING_SPOUSE:
2010-01-01: 3_000
2 changes: 1 addition & 1 deletion policyengine_us/parameters/gov/irs/ald/loss/max.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ SINGLE:
2023-01-01: 289_000
2024-01-01: 305_000
2027-01-01: .inf
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: .inf
2018-01-01: 500_000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ SINGLE:
2019-01-01: 255_000.0
2026-01-01: 283_535.22
2027-01-01: .inf
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: .inf
2018-01-01: 500_000.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ thresholds:
2022-01-01: 41_675
2023-01-01: 44_625
2024-01-01: 47_025
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: 72_500
2014-01-01: 73_800
Expand Down Expand Up @@ -159,7 +159,7 @@ thresholds:
2022-01-01: 459_750
2023-01-01: 492_300
2024-01-01: 518_900
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: 450_000
2014-01-01: 457_600
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ SEPARATE:
2013-01-01: 1_500
SINGLE:
2013-01-01: 3_000
WIDOW:
SURVIVING_SPOUSE:
2013-01-01: 3_000
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
JOINT:
0000-01-01: .inf
2023-01-01: 300_000
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: .inf
2023-01-01: 300_000
HEAD_OF_HOUSEHOLD:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
JOINT:
0000-01-01: .inf
2023-01-01: 150_000
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: .inf
2023-01-01: 150_000
HEAD_OF_HOUSEHOLD:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SEPARATE:
0000-01-01: 75_000
HEAD_OF_HOUSEHOLD:
0000-01-01: 112_500
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 150_000
metadata:
unit: currency-USD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ HEAD_OF_HOUSEHOLD:
2013-01-01: 75_000
2018-01-01: 200_000
2026-01-01: 75_000
WIDOW:
SURVIVING_SPOUSE:
2013-01-01: 75_000
2018-01-01: 400_000
2026-01-01: 75_000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ threshold:
HEAD_OF_HOUSEHOLD:
values:
2010-01-01: 7_500
WIDOW:
SURVIVING_SPOUSE:
values:
2010-01-01: 7_500
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ JOINT:
0000-01-01: 10_000
HEAD_OF_HOUSEHOLD:
0000-01-01: 7_500
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 5_000
SEPARATE:
0000-01-01: 5_000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ HEAD_OF_HOUSEHOLD:
0000-01-01: 0
2021-01-01: 112_500
2022-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 0
2021-01-01: 75_000
2022-01-01: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ HEAD_OF_HOUSEHOLD:
0000-01-01: 0
2020-01-01: 112_500
2021-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 0
2020-01-01: 75_000
2021-01-01: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ HEAD_OF_HOUSEHOLD:
0000-01-01: 0
2020-01-01: 112_500
2021-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
0000-01-01: 0
2020-01-01: 75_000
2021-01-01: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SEPARATE:
2018-01-01: 500_000
HEAD_OF_HOUSEHOLD:
2018-01-01: 1_000_000
WIDOW:
SURVIVING_SPOUSE:
2018-01-01: 1_000_000
metadata:
breakdown: filing_status
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ HEAD_OF_HOUSEHOLD:
2032-01-01: 420_150
2033-01-01: 428_550
2034-01-01: 437_150
WIDOW:
SURVIVING_SPOUSE:
2013-01-01: 300_000
2014-01-01: 305_050
2015-01-01: 309_900
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ HEAD_OF_HOUSEHOLD:
2015-01-01: 154_950
2016-01-01: 155_650
2017-01-01: 156_900
WIDOW:
SURVIVING_SPOUSE:
2009-01-01: 166_800
2013-01-01: 150_000
2014-01-01: 152_525
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ SINGLE:
2018-01-01: 10_000
2019-01-01: 10_000
2026-01-01: .inf
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: .inf
2014-01-01: .inf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SINGLE:
2013-01-01: 1.0
2018-01-01: 50_000.0
2026-01-01: 1.0
WIDOW:
SURVIVING_SPOUSE:
2013-01-01: 1.0
2018-01-01: 100_000.0
2026-01-01: 1.0
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ SINGLE:
2023-01-01: 182_100
2024-01-01: 191_950
2026-01-01: 0
WIDOW:
SURVIVING_SPOUSE:
2013-01-01: 0
2018-01-01: 315_000
2019-01-01: 321_400
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ HEAD_OF_HOUSEHOLD:
2025-08-01: 2_300
2025-09-01: 2_350
2025-10-01: 2_400
WIDOW:
SURVIVING_SPOUSE:
2018-01-01: 1_300
2019-01-01: 1_300
2021-01-01: 1_350
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ HEAD_OF_HOUSEHOLD:
2032-01-01: 13_650
2033-01-01: 13_950
2034-01-01: 14_250
WIDOW:
SURVIVING_SPOUSE:
2018-01-01: 24_000
2019-01-01: 24_400
2020-01-01: 24_400
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SEPARATE:
2018-01-01: 2_500
HEAD_OF_HOUSEHOLD:
2018-01-01: 5_000
WIDOW:
SURVIVING_SPOUSE:
2018-01-01: 5_000
metadata:
breakdown: filing_status
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ thresholds:
2022-01-01: 41_675
2023-01-01: 44_625
2024-01-01: 47_025
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: 72_500
2014-01-01: 73_800
Expand Down Expand Up @@ -158,7 +158,7 @@ thresholds:
2022-01-01: 459_750
2023-01-01: 492_300
2024-01-01: 518_900
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: 450_000
2014-01-01: 457_600
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ SINGLE:
2032-01-01: 79_300
2033-01-01: 80_900
2034-01-01: 82_500
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: 80_800
2014-01-01: 82_100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ SINGLE:
2032-01-01: 176_300
2033-01-01: 179_800
2034-01-01: 183_400
WIDOW:
SURVIVING_SPOUSE:
values:
2013-01-01: 153_900
2014-01-01: 156_500
Expand Down
Loading
Loading