From b13c292476f3077a4ca00a65cd1cf2c08ee1d18e Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Thu, 22 May 2025 14:30:27 +0100 Subject: [PATCH 1/3] Remove remaining Pension Credit double-count of private pension income Fixes #1132 --- changelog_entry.yaml | 4 ++++ .../earnings_sources.yaml | 0 .../guarantee_credit/income.yaml | 6 +++--- .../dwp/pension_credit/income/sources.yaml | 19 ------------------- .../pension_credit/pension_credit_earnings.py | 2 +- 5 files changed, 8 insertions(+), 23 deletions(-) rename policyengine_uk/parameters/gov/dwp/pension_credit/{income => guarantee_credit}/earnings_sources.yaml (100%) delete mode 100644 policyengine_uk/parameters/gov/dwp/pension_credit/income/sources.yaml diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29bb..833a7268d 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + fixed: + - Removed duplicate parameters in Pension Credit. diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/income/earnings_sources.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/earnings_sources.yaml similarity index 100% rename from policyengine_uk/parameters/gov/dwp/pension_credit/income/earnings_sources.yaml rename to policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/earnings_sources.yaml diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml index 48787086b..51b076ef7 100644 --- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml +++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml @@ -1,6 +1,6 @@ -description: Income sources included in income used to determine Guarantee Credit - entitlement. +description: Income sources included in income used to determine Pension Credit entitlement. metadata: + economy: false label: Pension Credit income sources name: pc_income_sources propagate_metadata_to_children: true @@ -10,7 +10,7 @@ metadata: unit: list values: 2002-01-01: - - earned_income + - pension_credit_earnings - working_tax_credit - state_pension - private_pension_income diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/income/sources.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/income/sources.yaml deleted file mode 100644 index 51b076ef7..000000000 --- a/policyengine_uk/parameters/gov/dwp/pension_credit/income/sources.yaml +++ /dev/null @@ -1,19 +0,0 @@ -description: Income sources included in income used to determine Pension Credit entitlement. -metadata: - economy: false - label: Pension Credit income sources - name: pc_income_sources - propagate_metadata_to_children: true - reference: - - href: https://www.legislation.gov.uk/ukpga/2002/16/section/15 - title: State Pension Credit Act 2002 s. 15(1) - unit: list -values: - 2002-01-01: - - pension_credit_earnings - - working_tax_credit - - state_pension - - private_pension_income - - capital_income - - esa_contrib - - jsa_contrib diff --git a/policyengine_uk/variables/gov/dwp/pension_credit/pension_credit_earnings.py b/policyengine_uk/variables/gov/dwp/pension_credit/pension_credit_earnings.py index dee916cc8..9cf8040c3 100644 --- a/policyengine_uk/variables/gov/dwp/pension_credit/pension_credit_earnings.py +++ b/policyengine_uk/variables/gov/dwp/pension_credit/pension_credit_earnings.py @@ -8,4 +8,4 @@ class pension_credit_earnings(Variable): value_type = float unit = GBP reference = "https://www.legislation.gov.uk/uksi/2002/1792/regulation/17A" - adds = "gov.dwp.pension_credit.income.earnings_sources" + adds = "gov.dwp.pension_credit.guarantee_credit.earnings_sources" From 106d9acfd633538379666de31a6d113844be8ac6 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Thu, 22 May 2025 14:34:10 +0100 Subject: [PATCH 2/3] Adjust test --- .../gov/dwp/pension_credit/pension_credit_income.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/policyengine_uk/tests/policy/baseline/gov/dwp/pension_credit/pension_credit_income.yaml b/policyengine_uk/tests/policy/baseline/gov/dwp/pension_credit/pension_credit_income.yaml index f08b05c69..65fd04e4f 100644 --- a/policyengine_uk/tests/policy/baseline/gov/dwp/pension_credit/pension_credit_income.yaml +++ b/policyengine_uk/tests/policy/baseline/gov/dwp/pension_credit/pension_credit_income.yaml @@ -1,12 +1,13 @@ - name: All income sources are included. period: 2021 input: - earned_income: 1 + employment_income: 1 working_tax_credit: 2 state_pension: 4 private_pension_income: 8 capital_income: 16 esa_contrib: 32 jsa_contrib: 64 + self_employment_income: 128 output: - pension_credit_income: 127 \ No newline at end of file + pension_credit_income: 255 \ No newline at end of file From dbb8d5aa3e923ff6cdf473e7ebe0675e8dc94f07 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Tue, 27 May 2025 11:43:45 +0100 Subject: [PATCH 3/3] Remove unneeded code --- .../gov/dwp/pension_credit/guarantee_credit/income.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml index 51b076ef7..3d90c7f69 100644 --- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml +++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/income.yaml @@ -1,6 +1,5 @@ description: Income sources included in income used to determine Pension Credit entitlement. metadata: - economy: false label: Pension Credit income sources name: pc_income_sources propagate_metadata_to_children: true