upstream master

Merge branch 'master' of https://github.com/PolicyEngine/policyengine-us into hua7450/issue5115

CHANGELOG.md

@@ -5,6 +5,30 @@ 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).
 
+## [1.129.3] - 2024-10-21 20:37:15
+
+### Fixed
+
+- Changed weekly_hours_worked to weekly_hours_worked_before_lsr in SNAP formula to avoid circular dependency.
+
+## [1.129.2] - 2024-10-21 20:22:41
+
+### Changed
+
+- Updated required version of policyengine-core
+
+## [1.129.1] - 2024-10-21 19:39:15
+
+### Fixed
+
+- Pregnant people counted as 2 for Medicaid FPG percent
+
+## [1.129.0] - 2024-10-17 19:59:12
+
+### Added
+
+- Biden NIIT label and description change.
+
 ## [1.128.0] - 2024-10-16 12:20:25
 
 ### Added
@@ -10029,6 +10053,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[1.129.3]: https://github.com/PolicyEngine/policyengine-us/compare/1.129.2...1.129.3
+[1.129.2]: https://github.com/PolicyEngine/policyengine-us/compare/1.129.1...1.129.2
+[1.129.1]: https://github.com/PolicyEngine/policyengine-us/compare/1.129.0...1.129.1
+[1.129.0]: https://github.com/PolicyEngine/policyengine-us/compare/1.128.0...1.129.0
 [1.128.0]: https://github.com/PolicyEngine/policyengine-us/compare/1.127.0...1.128.0
 [1.127.0]: https://github.com/PolicyEngine/policyengine-us/compare/1.126.0...1.127.0
 [1.126.0]: https://github.com/PolicyEngine/policyengine-us/compare/1.125.0...1.126.0

changelog.yaml

@@ -8503,3 +8503,24 @@
     added:
     - Michigan 2024 income tax rate update.
   date: 2024-10-16 12:20:25
+- bump: minor
+  changes:
+    added:
+    - Biden NIIT label and description change.
+  date: 2024-10-17 19:59:12
+- bump: patch
+  changes:
+    fixed:
+    - Pregnant people counted as 2 for Medicaid FPG percent
+  date: 2024-10-21 19:39:15
+- bump: patch
+  changes:
+    changed:
+    - Updated required version of policyengine-core
+  date: 2024-10-21 20:22:41
+- bump: patch
+  changes:
+    fixed:
+    - Changed weekly_hours_worked to weekly_hours_worked_before_lsr in SNAP formula
+      to avoid circular dependency.
+  date: 2024-10-21 20:37:15

policyengine_us/parameters/gov/contrib/biden/budget_2025/net_investment_income/rate.yaml

@@ -1,8 +1,8 @@
-description: President Biden proposed this additional NIIT tax rate.
+description: President Biden proposed this additional net investment income tax rate.
 metadata:
   unit: /1
   period: year
-  label: President Biden additional NIIT tax rate 
+  label: President Biden additional NIIT rate 
   reference:
     - title: General Explanations of the Administration's Fiscal Year 2025 Revenue Proposals
       href: https://home.treasury.gov/system/files/131/General-Explanations-FY2025.pdf#page=85

policyengine_us/parameters/gov/contrib/biden/budget_2025/net_investment_income/threshold.yaml

@@ -1,9 +1,9 @@
-description: President Biden proposed an additional Medicare tax rate for filers with adjusted gross income above this threshold.
+description: President Biden proposed an additional net investment income tax rate for filers with adjusted gross income above this threshold.
 metadata:
   unit: currency-USD
   period: year
   uprating: gov.irs.uprating
-  label: President Biden additional Medicare tax rate threshold
+  label: President Biden additional NIIT rate threshold
   reference:
     - title: General Explanations of the Administration's Fiscal Year 2025 Revenue Proposals
       href: https://home.treasury.gov/system/files/131/General-Explanations-FY2025.pdf#page=85

policyengine_us/tests/policy/baseline/gov/hhs/medicaid/income/tax_unit_medicaid_income_level.yaml

@@ -0,0 +1,75 @@
+- name: Multiple people with income
+  period: 2024
+  input:
+    people:
+      head:
+        current_pregnancies: 0
+      spouse:
+        current_pregnancies: 0
+    tax_units:
+      tax_unit:
+        medicaid_magi: 20_440
+        tax_unit_size: 2
+        members: [head, spouse]
+    households:
+      household:
+        state_group_str: CONTIGUOUS_US
+  output:
+    tax_unit_medicaid_income_level: 1
+
+- name: Multiple people with no income
+  period: 2024
+  input:
+    people:
+      head:
+        current_pregnancies: 0
+      spouse:
+        current_pregnancies: 0
+    tax_units:
+      tax_unit:
+        medicaid_magi: 0
+        tax_unit_size: 2
+        members: [head, spouse]
+    households:
+      household:
+        state_group_str: CONTIGUOUS_US
+  output:
+    tax_unit_medicaid_income_level: 0
+
+- name: Multiple people with income and a pregnant person
+  period: 2024
+  input:
+    people:
+      head:
+        current_pregnancies: 1
+      spouse:
+        current_pregnancies: 0
+    tax_units:
+      tax_unit:
+        medicaid_magi: 25_820
+        tax_unit_size: 2
+        members: [head, spouse]
+    households:
+      household:
+        state_group_str: CONTIGUOUS_US
+  output:
+    tax_unit_medicaid_income_level: 1
+
+- name: Multiple people with income and a pregnant person expecting twins
+  period: 2024
+  input:
+    people:
+      head:
+        current_pregnancies: 2
+      spouse:
+        current_pregnancies: 0
+    tax_units:
+      tax_unit:
+        medicaid_magi: 31_200
+        tax_unit_size: 2
+        members: [head, spouse]
+    households:
+      household:
+        state_group_str: CONTIGUOUS_US
+  output:
+    tax_unit_medicaid_income_level: 1

policyengine_us/tests/policy/baseline/gov/usda/snap/eligibility/student/is_snap_ineligible_student.yaml

@@ -4,7 +4,7 @@
     is_full_time_student: true
     age: 18
     is_disabled: false
-    weekly_hours_worked: false
+    weekly_hours_worked_before_lsr: false
     is_parent: false
   output:
     is_snap_ineligible_student: true
@@ -15,7 +15,7 @@
     is_full_time_student: true
     age: 17
     is_disabled: false
-    weekly_hours_worked: false
+    weekly_hours_worked_before_lsr: false
     is_parent: false
   output:
     is_snap_ineligible_student: false

policyengine_us/variables/gov/hhs/medicaid/income/tax_unit_medicaid_income_level.py

@@ -1,4 +1,5 @@
 from policyengine_us.model_api import *
+from policyengine_us.variables.gov.hhs.tax_unit_fpg import fpg
 
 
 class tax_unit_medicaid_income_level(Variable):
@@ -10,10 +11,24 @@ class tax_unit_medicaid_income_level(Variable):
         "Medicaid/CHIP-related MAGI as fraction of federal poverty line."
         "Documentation: 'Federal poverty level (FPL)' at the following URL:"
         "URL: https://www.healthcare.gov/glossary/federal-poverty-level-fpl/"
+        "**Pregnant Women:**"
+        "  * Pregnant women are counted as themselves plus the number of children they are expecting to deliver"
+        "    when determining household size for Medicaid eligibility."
+        "  * Sources:"
+        "      URL: https://www.sos.state.co.us/CCR/GenerateRulePdf.do?ruleVersionId=11618&fileName=10%20CCR%25202505-10%208.100"
+        "      URL: https://www.cms.gov/marketplace/technical-assistance-resources/special-populations-pregnant-women.pdf"
     )
     definition_period = YEAR
 
     def formula(tax_unit, period, parameters):
         income = tax_unit("medicaid_magi", period)
-        fpg = tax_unit("tax_unit_fpg", period)
-        return income / fpg
+
+        pregnant_count = add(tax_unit, period, ["current_pregnancies"])
+        tax_unit_size = tax_unit("tax_unit_size", period)
+        state_group = tax_unit.household("state_group_str", period)
+
+        medicaid_fpg = fpg(
+            pregnant_count + tax_unit_size, state_group, period, parameters
+        )
+
+        return income / medicaid_fpg

policyengine_us/variables/gov/hhs/tax_unit_fpg.py

@@ -1,6 +1,13 @@
 from policyengine_us.model_api import *
 
 
+def fpg(unit_size, state_group, period, parameters):
+    p_fpg = parameters(period).gov.hhs.fpg
+    p1 = p_fpg.first_person[state_group]
+    pn = p_fpg.additional_person[state_group]
+    return p1 + pn * (unit_size - 1)
+
+
 class tax_unit_fpg(Variable):
     value_type = float
     entity = TaxUnit
@@ -11,7 +18,4 @@ class tax_unit_fpg(Variable):
     def formula(tax_unit, period, parameters):
         n = tax_unit("tax_unit_size", period)
         state_group = tax_unit.household("state_group_str", period)
-        p_fpg = parameters(period).gov.hhs.fpg
-        p1 = p_fpg.first_person[state_group]
-        pn = p_fpg.additional_person[state_group]
-        return p1 + pn * (n - 1)
+        return fpg(n, state_group, period, parameters)

policyengine_us/variables/gov/usda/snap/eligibility/student/is_snap_ineligible_student.py

@@ -17,7 +17,7 @@ def formula(person, period, parameters):
         p = parameters(period).gov.usda.snap.student
         age_eligible = p.age_threshold.calc(age)
         disabled = person("is_disabled", period)
-        hours_worked = person("weekly_hours_worked", period)
+        hours_worked = person("weekly_hours_worked_before_lsr", period)
         hours_eligible = hours_worked >= p.working_hours_threshold
         # The parental status applies to children under 6 (under 12
         # if no care available)

policyengine_us/variables/household/demographic/person/current_pregnancies.py

@@ -0,0 +1,8 @@
+from policyengine_us.model_api import *
+
+
+class current_pregnancies(Variable):
+    value_type = int
+    entity = Person
+    definition_period = YEAR
+    label = "The number of children a pregnant person is expecting"

policyengine_us/variables/household/demographic/person/is_pregnant.py

@@ -6,3 +6,4 @@ class is_pregnant(Variable):
     entity = Person
     label = "Is pregnant"
     definition_period = YEAR
+    adds = ["current_pregnancies"]

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name="policyengine-us",
-    version="1.128.0",
+    version="1.129.3",
     author="PolicyEngine",
     author_email="[email protected]",
     long_description=readme,
@@ -34,7 +34,7 @@
         ),
     ],
     install_requires=[
-        "policyengine-core>=3.8.1",
+        "policyengine-core>=3.10.0",
         "policyengine-us-data==1.11.0",
         "microdf-python",
         "tqdm",