Skip to content

Add and inflation-index remaining SPM components #3706

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jan 27, 2024
Merged

Add and inflation-index remaining SPM components #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d0ad4f
Capture all components of SPM resources in spm_unit_net_income, and u…
MaxGhenis Jan 27, 2024
8290c8f
Fix #3691
MaxGhenis Jan 27, 2024
fc04573
Changelog
MaxGhenis Jan 27, 2024
73ca513
make format
MaxGhenis Jan 27, 2024
46a3d71
Uprate some more
MaxGhenis Jan 27, 2024
17b1dd7
fix housing piece
MaxGhenis Jan 27, 2024
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
5 changes: 5 additions & 0 deletions changelog_entry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- bump: patch
changes:
fixed:
- Added remaining components to SPM net income.
- Inflation-index SPM-related variables.
2 changes: 1 addition & 1 deletion policyengine_us/data/datasets/cps/cps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def add_spm_variables(cps: h5py.File, spm_unit: DataFrame) -> None:
spm_unit_payroll_tax_reported="SPM_FICA",
spm_unit_federal_tax_reported="SPM_FEDTAX",
spm_unit_state_tax_reported="SPM_STTAX",
spm_unit_work_childcare_expenses="SPM_CAPWKCCXPNS",
spm_unit_capped_work_childcare_expenses="SPM_CAPWKCCXPNS",
spm_unit_medical_expenses="SPM_MEDXPNS",
spm_unit_spm_threshold="SPM_POVTHRESHOLD",
spm_unit_net_income_reported="SPM_RESOURCES",
Expand Down
2 changes: 1 addition & 1 deletion policyengine_us/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

COUNTRY_DIR = Path(__file__).parent

CURRENT_YEAR = 2023
CURRENT_YEAR = 2024
year_start = str(CURRENT_YEAR) + "-01-01"


Expand Down
4 changes: 4 additions & 0 deletions policyengine_us/tests/policy/baseline/household/income/spm_unit/spm_unit_benefits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
free_school_meals: 0
reduced_price_school_meals: 0
spm_unit_broadband_subsidy: 0
spm_unit_energy_subsidy: 0
tanf: 0
high_efficiency_electric_home_rebate: 0
residential_efficiency_electrification_rebate: 0
unemployment_compensation: 0
basic_income: 0
output:
spm_unit_benefits: 1
Expand All @@ -30,9 +32,11 @@
free_school_meals: 0
reduced_price_school_meals: 0
spm_unit_broadband_subsidy: 0
spm_unit_energy_subsidy: 0
tanf: 0
high_efficiency_electric_home_rebate: 0
residential_efficiency_electrification_rebate: 0
unemployment_compensation: 0
basic_income: 0
output:
spm_unit_benefits: 0
1 change: 1 addition & 0 deletions policyengine_us/variables/household/expense/child_support/child_support_expense.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ class child_support_expense(Variable):
unit = USD
documentation = "Legally mandated child support expenses."
definition_period = YEAR
uprating = "gov.bls.cpi.c_cpi_u"
1 change: 1 addition & 0 deletions policyengine_us/variables/household/expense/child_support/child_support_received.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ class child_support_received(Variable):
unit = USD
documentation = "Value of child support benefits received."
definition_period = YEAR
uprating = "gov.bls.cpi.c_cpi_u"
1 change: 1 addition & 0 deletions ...ngine_us/variables/household/expense/childcare/spm_unit_capped_work_childcare_expenses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ class spm_unit_capped_work_childcare_expenses(Variable):
label = "SPM unit work and childcare expenses"
definition_period = YEAR
unit = USD
uprating = "gov.bls.cpi.c_cpi_u"
1 change: 1 addition & 0 deletions policyengine_us/variables/household/expense/health/medical_out_of_pocket_expenses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ class medical_out_of_pocket_expenses(Variable):
label = "Medical out of pocket expenses"
unit = USD
definition_period = YEAR
uprating = "gov.bls.cpi.c_cpi_u"
1 change: 1 addition & 0 deletions policyengine_us/variables/household/income/spm_unit/spm_unit_benefits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def formula(spm_unit, period, parameters):
"free_school_meals",
"reduced_price_school_meals",
"spm_unit_broadband_subsidy",
"spm_unit_energy_subsidy",
"tanf",
"high_efficiency_electric_home_rebate",
"residential_efficiency_electrification_rebate",
Expand Down
1 change: 1 addition & 0 deletions policyengine_us/variables/household/income/spm_unit/spm_unit_broadband_subsidy_reported.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ class spm_unit_broadband_subsidy_reported(Variable):
label = "SPM unit reported broadband subsidy"
definition_period = YEAR
unit = USD
uprating = "gov.bls.cpi.c_cpi_u"
1 change: 1 addition & 0 deletions ...engine_us/variables/household/income/spm_unit/spm_unit_capped_housing_subsidy_reported.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ class spm_unit_capped_housing_subsidy_reported(Variable):
label = "SPM unit capped housing subsidy"
definition_period = YEAR
unit = USD
uprating = "gov.bls.cpi.c_cpi_u"
1 change: 1 addition & 0 deletions policyengine_us/variables/household/income/spm_unit/spm_unit_energy_subsidy_reported.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ class spm_unit_energy_subsidy_reported(Variable):
label = "SPM unit school energy subsidy (reported)"
definition_period = YEAR
unit = USD
uprating = "gov.bls.cpi.c_cpi_u"
2 changes: 1 addition & 1 deletion policyengine_us/variables/household/income/spm_unit/spm_unit_net_income.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ class spm_unit_net_income(Variable):
unit = USD

adds = ["spm_unit_market_income", "spm_unit_benefits"]
subtracts = ["spm_unit_taxes"]
subtracts = ["spm_unit_taxes", "spm_unit_spm_expenses"]
15 changes: 15 additions & 0 deletions policyengine_us/variables/household/income/spm_unit/spm_unit_spm_expenses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from policyengine_us.model_api import *


class spm_unit_spm_expenses(Variable):
value_type = float
entity = SPMUnit
label = "SPM unit's SPM expenses (other than taxes)"
definition_period = YEAR
unit = USD

adds = [
"child_support_expense",
"medical_out_of_pocket_expense",
"spm_unit_capped_work_childcare_expenses",
]
1 change: 1 addition & 0 deletions policyengine_us/variables/household/income/spm_unit/spm_unit_spm_threshold.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ class spm_unit_spm_threshold(Variable):
label = "SPM unit's SPM poverty threshold"
definition_period = YEAR
unit = USD
uprating = "gov.bls.cpi.c_cpi_u"