From f0524add84d318619c477e2c234ef930a09cf7ff Mon Sep 17 00:00:00 2001 From: Max Ghenis Date: Tue, 20 Oct 2026 22:58:05 -0400 Subject: [PATCH] Count the FL and SD LIHEAP comments in the source-conflict ratchet baseline The guard (#10287) took its KNOWN_UNMARKED baseline at 0f21a638. FL LIHEAP (#9969) and SD LIHEAP (#9974) merged before the guard did, each with comments the ratchet reads as unmarked source conflicts, so test_conflict_sounding_comments_do_not_grow fails on main from ce9377ee. These five files were on main when the guard landed, so they belong in the baseline, one comment each. Co-Authored-By: Claude Opus 5.5 --- changelog.d/source-conflict-guard-liheap.fixed.md | 1 + policyengine_us/tests/code_health/test_source_conflicts.py | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 changelog.d/source-conflict-guard-liheap.fixed.md diff --git a/changelog.d/source-conflict-guard-liheap.fixed.md b/changelog.d/source-conflict-guard-liheap.fixed.md new file mode 100644 index 00000000000..e5eaa2bba8c --- /dev/null +++ b/changelog.d/source-conflict-guard-liheap.fixed.md @@ -0,0 +1 @@ +Count the FL and SD LIHEAP comments that merged before the source-conflict guard in its ratchet baseline, so the guard passes on main. diff --git a/policyengine_us/tests/code_health/test_source_conflicts.py b/policyengine_us/tests/code_health/test_source_conflicts.py index 8512cb59e88..25311fb01e9 100644 --- a/policyengine_us/tests/code_health/test_source_conflicts.py +++ b/policyengine_us/tests/code_health/test_source_conflicts.py @@ -124,11 +124,13 @@ "policyengine_us/parameters/gov/states/ca/cpuc/income_sources.yaml": 1, "policyengine_us/parameters/gov/states/co/doi/premium_assistance/amount/additional_member.yaml": 1, "policyengine_us/parameters/gov/states/co/doi/premium_assistance/amount/first_member.yaml": 1, + "policyengine_us/parameters/gov/states/fl/commerce/liheap/payment/base_amount.yaml": 1, "policyengine_us/parameters/gov/states/hi/bessd/ccap/income/countable_income/sources.yaml": 1, "policyengine_us/parameters/gov/states/ma/hic/connector_care/fpl_floor.yaml": 1, "policyengine_us/parameters/gov/states/mo/tax/income/deductions/federal_income_tax/ignored_credits.yaml": 1, "policyengine_us/parameters/gov/states/mt/tax/income/subtractions/disability_income/cap.yaml": 1, "policyengine_us/parameters/gov/states/or/ohcs/liheap/payment/income_band.yaml": 1, + "policyengine_us/parameters/gov/states/sd/dss/liheap/income/limits/table/in_effect.yaml": 1, "policyengine_us/parameters/gov/states/ut/dwf/ccap/copay/income_limits.yaml": 1, "policyengine_us/parameters/gov/states/wi/tax/income/credits/homestead/income/disqualified_loss_sources.yaml": 1, "policyengine_us/parameters/gov/territories/pr/tax/income/credits/earned_income/eligibility/min.yaml": 1, @@ -150,6 +152,9 @@ "policyengine_us/variables/gov/local/tax/sales/local_sales_tax.py": 1, "policyengine_us/variables/gov/states/ar/ade/oec/sra/rates/ar_sra_daily_copay.py": 1, "policyengine_us/variables/gov/states/ct/tax/income/rebate/ct_child_tax_rebate.py": 1, + "policyengine_us/variables/gov/states/fl/commerce/liheap/eligibility/fl_liheap_eligible.py": 1, + "policyengine_us/variables/gov/states/fl/commerce/liheap/eligibility/fl_liheap_income_limit.py": 1, + "policyengine_us/variables/gov/states/fl/commerce/liheap/fl_liheap.py": 1, "policyengine_us/variables/gov/states/hi/tax/income/credits/cdcc/hi_cdcc_qualifying_individuals.py": 1, "policyengine_us/variables/gov/states/hi/tax/income/subtractions/hi_student_loan_interest_adjustment.py": 1, "policyengine_us/variables/gov/states/ks/tax/income/deductions/ks_itemized_deductions.py": 1,