Skip to content

Commit

Permalink
merge branch
Browse files Browse the repository at this point in the history
  • Loading branch information
laviniawo committed Apr 4, 2024
2 parents 3f79233 + ae3ac70 commit f3f5ed2
Show file tree
Hide file tree
Showing 489 changed files with 1,580 additions and 726 deletions.
57 changes: 57 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,55 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.722.2] - 2024-04-04 16:13:37

### Fixed

- Adjust the widow filing status to surviving spouse in the gov.contrib.biden.budget_2025.capital_gains.income_threshold file.

## [0.722.1] - 2024-04-04 03:29:14

### Fixed

- Kentucky tax unit itemizes deductions logic.

## [0.722.0] - 2024-04-02 21:40:33

### Added

- Rename widow to surviving spouse.

## [0.721.1] - 2024-04-02 15:56:44

### Fixed

- Fix Virginia low-income credit calculation.
- Fix Virginia itemized deduction calculation.

## [0.721.0] - 2024-04-01 22:07:43

### Added

- 2023 Kansas Tax Rules.

## [0.720.0] - 2024-04-01 00:10:04

### Added

- Delaware 2023 income tax parameters.

## [0.719.1] - 2024-04-01 00:02:30

### Fixed

- Add taxable social security to the list of Delaware exclusions.

## [0.719.0] - 2024-03-31 22:26:12

### Added

- 2023 New Mexico Tax Rules.

## [0.718.0] - 2024-03-29 22:09:50

### Added
Expand Down Expand Up @@ -8022,6 +8071,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0



[0.722.2]: https://github.com/PolicyEngine/policyengine-us/compare/0.722.1...0.722.2
[0.722.1]: https://github.com/PolicyEngine/policyengine-us/compare/0.722.0...0.722.1
[0.722.0]: https://github.com/PolicyEngine/policyengine-us/compare/0.721.1...0.722.0
[0.721.1]: https://github.com/PolicyEngine/policyengine-us/compare/0.721.0...0.721.1
[0.721.0]: https://github.com/PolicyEngine/policyengine-us/compare/0.720.0...0.721.0
[0.720.0]: https://github.com/PolicyEngine/policyengine-us/compare/0.719.1...0.720.0
[0.719.1]: https://github.com/PolicyEngine/policyengine-us/compare/0.719.0...0.719.1
[0.719.0]: https://github.com/PolicyEngine/policyengine-us/compare/0.718.0...0.719.0
[0.718.0]: https://github.com/PolicyEngine/policyengine-us/compare/0.717.0...0.718.0
[0.717.0]: https://github.com/PolicyEngine/policyengine-us/compare/0.716.2...0.717.0
[0.716.2]: https://github.com/PolicyEngine/policyengine-us/compare/0.716.1...0.716.2
Expand Down
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
42 changes: 42 additions & 0 deletions changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6844,3 +6844,45 @@
added:
- Include the ky_cdcc to the net income tree.
date: 2024-03-29 22:09:50
- bump: minor
changes:
added:
- 2023 New Mexico Tax Rules.
date: 2024-03-31 22:26:12
- bump: patch
changes:
fixed:
- Add taxable social security to the list of Delaware exclusions.
date: 2024-04-01 00:02:30
- bump: minor
changes:
added:
- Delaware 2023 income tax parameters.
date: 2024-04-01 00:10:04
- bump: minor
changes:
added:
- 2023 Kansas Tax Rules.
date: 2024-04-01 22:07:43
- bump: patch
changes:
fixed:
- Fix Virginia low-income credit calculation.
- Fix Virginia itemized deduction calculation.
date: 2024-04-02 15:56:44
- bump: minor
changes:
added:
- Rename widow to surviving spouse.
date: 2024-04-02 21:40:33
- bump: patch
changes:
fixed:
- Kentucky tax unit itemizes deductions logic.
date: 2024-04-04 03:29:14
- bump: patch
changes:
fixed:
- Adjust the widow filing status to surviving spouse in the gov.contrib.biden.budget_2025.capital_gains.income_threshold
file.
date: 2024-04-04 16:13:37
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 @@ -8,7 +8,6 @@


def main():

CalibratedPUFExtendedCPS_2022().generate()

for file in STORAGE_FOLDER.glob("*.csv.gz"):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ SEPARATE:
2024-01-01: 500_000
HEAD_OF_HOUSEHOLD:
2024-01-01: 1_000_000
WIDOW:
SURVIVING_SPOUSE:
2024-01-01: 1_000_000
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
Loading

0 comments on commit f3f5ed2

Please sign in to comment.