PolicyEngine-UK 2.4.0__tar.gz → 2.6.0__tar.gz

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/CHANGELOG.md

@@ -5,6 +5,18 @@ 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).
 
+## [2.6.0] - 2024-10-19 19:58:09
+
+### Fixed
+
+- Bug in budget change reforms.
+
+## [2.5.0] - 2024-10-19 09:27:21
+
+### Changed
+
+- UK data package bumped to 1.6.
+
 ## [2.4.0] - 2024-10-17 21:43:42
 
 ### Added
@@ -1506,6 +1518,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[2.6.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.5.0...2.6.0
+[2.5.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.4.0...2.5.0
 [2.4.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.3.0...2.4.0
 [2.3.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.1.1...2.2.0

{PolicyEngine-UK-2.4.0/PolicyEngine_UK.egg-info → PolicyEngine-UK-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PolicyEngine-UK
-Version: 2.4.0
+Version: 2.6.0
 Summary: PolicyEngine tax and benefit system for the UK
 Home-page: https://github.com/PolicyEngine/policyengine-uk
 Author: PolicyEngine

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0/PolicyEngine_UK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PolicyEngine-UK
-Version: 2.4.0
+Version: 2.6.0
 Summary: PolicyEngine tax and benefit system for the UK
 Home-page: https://github.com/PolicyEngine/policyengine-uk
 Author: PolicyEngine

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/PolicyEngine_UK.egg-info/SOURCES.txt

@@ -549,7 +549,6 @@ policyengine_uk/reforms/conservatives/household_based_hitc.py
 policyengine_uk/reforms/cps/__init__.py
 policyengine_uk/reforms/cps/marriage_tax_reforms.py
 policyengine_uk/reforms/policyengine/__init__.py
-policyengine_uk/reforms/policyengine/budget_change.py
 policyengine_uk/reforms/policyengine/disable_simulated_benefits.py
 policyengine_uk/tests/test_parameter_metadata.py
 policyengine_uk/tests/code_health/test_variables.py
@@ -562,7 +561,6 @@ policyengine_uk/tests/policy/baseline/contrib/ubi_center/basic_income/bi_maximum
 policyengine_uk/tests/policy/baseline/demographic/benunit.yaml
 policyengine_uk/tests/policy/baseline/demographic/household.yaml
 policyengine_uk/tests/policy/baseline/demographic/person.yaml
-policyengine_uk/tests/policy/baseline/demographic/poverty.yaml
 policyengine_uk/tests/policy/baseline/finance/benefit/care.yaml
 policyengine_uk/tests/policy/baseline/finance/benefit/disability.yaml
 policyengine_uk/tests/policy/baseline/finance/benefit/general.yaml
@@ -693,6 +691,7 @@ policyengine_uk/utils/psnd.py
 policyengine_uk/utils/solve_private_school_attendance_factor.py
 policyengine_uk/variables/contrib/cec/non_primary_residence_wealth_tax.py
 policyengine_uk/variables/contrib/labour/private_school_vat.py
+policyengine_uk/variables/contrib/policyengine/budget_change.py
 policyengine_uk/variables/contrib/policyengine/employer_ni/employer_ni_fixed_employer_cost_change.py
 policyengine_uk/variables/contrib/ubi_center/carbon_tax.py
 policyengine_uk/variables/contrib/ubi_center/land_value_tax.py

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/PolicyEngine_UK.egg-info/requires.txt

@@ -1,5 +1,5 @@
 PolicyEngine-Core>=3.6.4
-PolicyEngine-UK-Data<1.6,>=1.5
+PolicyEngine-UK-Data<1.7,>=1.6
 microdf_python
 
 [dev]

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/policyengine_uk/reforms/policyengine/__init__.py

@@ -1,2 +1 @@
-from .budget_change import *
 from .disable_simulated_benefits import *

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/policyengine_uk/reforms/reforms.py

@@ -1,7 +1,6 @@
 from .cps import create_marriage_tax_reform
 from .conservatives import create_household_based_hitc_reform
 from .policyengine import (
-    create_budget_change_reform,
     disable_simulated_benefits,
 )
 from policyengine_core.model_api import *
@@ -13,7 +12,6 @@ def create_structural_reforms_from_parameters(parameters, period):
     reforms = [
         create_marriage_tax_reform(parameters, period),
         create_household_based_hitc_reform(parameters, period),
-        create_budget_change_reform(parameters, period),
         disable_simulated_benefits(parameters, period),
     ]
     reforms = tuple(filter(lambda x: x is not None, reforms))

{PolicyEngine-UK-2.4.0/policyengine_uk/reforms → PolicyEngine-UK-2.6.0/policyengine_uk/variables/contrib}/policyengine/budget_change.py

@@ -313,129 +313,6 @@ class other_public_spending_budget_change(Variable):
         return decile.map(average_per_decile).replace({np.nan: 0})
 
 
-class household_tax(Variable):
-    value_type = float
-    entity = Household
-    label = "household taxes"
-    documentation = "Total taxes owed by the household"
-    definition_period = YEAR
-    unit = GBP
-    adds = [
-        "expected_sdlt",
-        "expected_ltt",
-        "expected_lbtt",
-        "corporate_sdlt",
-        "business_rates",
-        "council_tax",
-        "domestic_rates",
-        "fuel_duty",
-        "tv_licence",
-        "wealth_tax",
-        "non_primary_residence_wealth_tax",
-        "income_tax",
-        "national_insurance",
-        "LVT",
-        "carbon_tax",
-        "vat_change",
-        "capital_gains_tax",
-        "corporate_incident_tax_revenue_change",
-        "consumer_incident_tax_revenue_change",
-        "private_school_vat",
-        "high_income_incident_tax_change",
-    ]
-
-    def formula(household, period, parameters):
-        if parameters(period).gov.contrib.abolish_council_tax:
-            return add(
-                household,
-                period,
-                [
-                    tax
-                    for tax in household_tax.adds
-                    if tax not in ["council_tax"]
-                ],
-            )
-        else:
-            return add(household, period, household_tax.adds)
-
-
-class household_benefits(Variable):
-    value_type = float
-    entity = Household
-    label = "household benefits"
-    documentation = "Total value of benefits received by household"
-    definition_period = YEAR
-    unit = GBP
-    adds = [
-        "child_benefit",
-        "esa_income",
-        "housing_benefit",
-        "income_support",
-        "jsa_income",
-        "pension_credit",
-        "universal_credit",
-        "working_tax_credit",
-        "child_tax_credit",
-        "attendance_allowance",
-        "afcs",
-        "bsp",
-        "carers_allowance",
-        "dla",
-        "esa_contrib",
-        "iidb",
-        "incapacity_benefit",
-        "jsa_contrib",
-        "pip",
-        "sda",
-        "state_pension",
-        "maternity_allowance",
-        "statutory_sick_pay",
-        "statutory_maternity_pay",
-        "ssmg",
-        "basic_income",
-        "epg_subsidy",
-        "cost_of_living_support_payment",
-        "energy_bills_rebate",
-        "nhs_budget_change",
-        "education_budget_change",
-        "other_public_spending_budget_change",
-    ]
-
-    def formula(household, period, parameters):
-        contrib = parameters(period).gov.contrib
-        uprating = contrib.benefit_uprating
-        benefits = household_benefits.adds
-        if contrib.abolish_council_tax:
-            benefits = [
-                benefit
-                for benefit in benefits
-                if benefit != "council_tax_benefit"
-            ]
-        general_benefits = add(
-            household,
-            period,
-            [
-                benefit
-                for benefit in benefits
-                if benefit not in ["basic_income"]
-            ],
-        )
-        non_sp_benefits = add(
-            household,
-            period,
-            [
-                benefit
-                for benefit in benefits
-                if benefit not in ["state_pension", "basic_income"]
-            ],
-        )
-        return (
-            add(household, period, benefits)
-            + general_benefits * uprating.all
-            + non_sp_benefits * uprating.non_sp
-        )
-
-
 class corporate_incident_tax_revenue_change(Variable):
     label = "corporate-incident tax revenue change"
     entity = Household
@@ -493,31 +370,3 @@ class consumer_incident_tax_revenue_change(Variable):
             period
         ).gov.contrib.policyengine.budget.consumer_incident_tax_change
         return revenue_change * share * 1e9
-
-
-class budget_change_reform(Reform):
-    def apply(self):
-        self.add_variables(
-            pre_budget_change_ons_household_income_decile,
-            pre_budget_change_household_benefits,
-            pre_budget_change_household_tax,
-            pre_budget_change_household_net_income,
-            nhs_budget_change,
-            education_budget_change,
-            other_public_spending_budget_change,
-            corporate_incident_tax_revenue_change,
-            consumer_incident_tax_revenue_change,
-            high_income_incident_tax_change,
-        )
-        self.update_variable(household_benefits)
-        self.update_variable(household_tax)
-
-
-def create_budget_change_reform(parameters, _):
-    budget = parameters.gov.contrib.policyengine.budget
-    for child in budget.children:
-        for iteration in budget.children[child].values_list:
-            if iteration.value != 0:
-                return budget_change_reform
-
-    return None

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/policyengine_uk/variables/gov/hmrc/tax.py

@@ -37,6 +37,9 @@ class household_tax(Variable):
         "vat_change",
         "capital_gains_tax",
         "private_school_vat",
+        "corporate_incident_tax_revenue_change",
+        "consumer_incident_tax_revenue_change",
+        "high_income_incident_tax_change",
     ]
 
     def formula(household, period, parameters):

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/policyengine_uk/variables/household/income/benefit.py

@@ -44,6 +44,9 @@ class household_benefits(Variable):
         "cost_of_living_support_payment",
         "energy_bills_rebate",
         "winter_fuel_allowance",
+        "nhs_budget_change",
+        "education_budget_change",
+        "other_public_spending_budget_change",
     ]
 
     def formula(household, period, parameters):

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/policyengine_uk/variables/household/income/income.py

@@ -136,8 +136,46 @@ class hbai_household_net_income(Variable):
     unit = GBP
     definition_period = YEAR
 
-    adds = ["household_gross_income"]
-    subtracts = ["household_tax", "baseline_hbai_excluded_income"]
+    adds = [
+        "household_market_income",
+        "child_benefit",
+        "esa_income",
+        "esa_contrib",
+        "housing_benefit",
+        "income_support",
+        "jsa_income",
+        "jsa_contrib",
+        "pension_credit",
+        "universal_credit",
+        "working_tax_credit",
+        "child_tax_credit",
+        "attendance_allowance",
+        "afcs",
+        "bsp",
+        "carers_allowance",
+        "dla",
+        "iidb",
+        "incapacity_benefit",
+        "jsa_contrib",
+        "pip",
+        "sda",
+        "state_pension",
+        "maternity_allowance",
+        "statutory_sick_pay",
+        "statutory_maternity_pay",
+        "ssmg",
+        "basic_income",
+        "epg_subsidy",
+        "cost_of_living_support_payment",
+        "winter_fuel_allowance",
+    ]
+    subtracts = [
+        "council_tax",
+        "domestic_rates",
+        "wealth_tax",
+        "income_tax",
+        "national_insurance",
+    ]
 
 
 class household_net_income(Variable):

{PolicyEngine-UK-2.4.0 → PolicyEngine-UK-2.6.0}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="PolicyEngine-UK",
-    version="2.4.0",
+    version="2.6.0",
     author="PolicyEngine",
     author_email="nikhil@policyengine.org",
     classifiers=[
@@ -27,7 +27,7 @@ setup(
     ],
     install_requires=[
         "PolicyEngine-Core>=3.6.4",
-        "PolicyEngine-UK-Data>=1.5,<1.6",
+        "PolicyEngine-UK-Data>=1.6,<1.7",
         "microdf_python",
     ],
     extras_require={

PolicyEngine-UK-2.4.0/policyengine_uk/tests/policy/baseline/demographic/poverty.yaml

@@ -1,12 +0,0 @@
-- name: Poverty gap for single person
-  period: 2022
-  absolute_error_margin: 100
-  input:
-    age: 35
-    household_gross_income: 0
-    is_household_head: true
-    household_weight: 1
-  output:
-    poverty_gap_bhc: 220 * 52
-    in_poverty_bhc: true
-    in_deep_poverty_bhc: true