PolicyEngine-UK 2.22.2__tar.gz → 2.22.4__tar.gz

{policyengine_uk-2.22.2 → policyengine_uk-2.22.4}/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.22.4] - 2025-03-25 11:47:32
+
+### Fixed
+
+- Baseline microsimulations break with no reform.
+
+## [2.22.3] - 2025-03-25 11:03:07
+
+### Fixed
+
+- OBR forecast parameters now affect other parameters.
+
 ## [2.22.2] - 2025-03-23 23:09:48
 
 ### Fixed
@@ -1671,6 +1683,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[2.22.4]: https://github.com/PolicyEngine/openfisca-uk/compare/2.22.3...2.22.4
+[2.22.3]: https://github.com/PolicyEngine/openfisca-uk/compare/2.22.2...2.22.3
 [2.22.2]: https://github.com/PolicyEngine/openfisca-uk/compare/2.22.1...2.22.2
 [2.22.1]: https://github.com/PolicyEngine/openfisca-uk/compare/2.22.0...2.22.1
 [2.22.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.21.0...2.22.0

{policyengine_uk-2.22.2/PolicyEngine_UK.egg-info → policyengine_uk-2.22.4}/PKG-INFO

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

{policyengine_uk-2.22.2 → policyengine_uk-2.22.4/PolicyEngine_UK.egg-info}/PKG-INFO

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

{policyengine_uk-2.22.2 → policyengine_uk-2.22.4}/policyengine_uk/system.py

@@ -13,6 +13,7 @@ from policyengine_uk.utils.parameters import (
     backdate_parameters,
     convert_to_fiscal_year_parameters,
 )
+from policyengine_core.reforms import Reform
 from policyengine_uk_data import DATASETS, EnhancedFRS_2022_23
 from policyengine_uk.reforms import create_structural_reforms_from_parameters
 from policyengine_uk.parameters.gov.obr.add_per_capita_parameters import (
@@ -36,6 +37,7 @@ from policyengine_core.parameters.operations.propagate_parameter_metadata import
 from policyengine_core.parameters.operations.uprate_parameters import (
     uprate_parameters,
 )
+from policyengine_core.reforms import Reform
 
 COUNTRY_DIR = Path(__file__).parent
 
@@ -54,13 +56,7 @@ class CountryTaxBenefitSystem(TaxBenefitSystem):
     ]
     modelled_policies = COUNTRY_DIR / "modelled_policies.yaml"
 
-    def __init__(self, reform=None):
-        super().__init__(entities, reform=reform)
-
-        self.parameters_dir = COUNTRY_DIR / "parameters"
-
-        self.load_parameters(self.parameters_dir)
-
+    def process_parameters(self, reform=None):
         self.parameters = extend_obr_forecast(self.parameters)
         self.parameters = add_per_capita_parameters(self.parameters)
         self.parameters = add_triple_lock(self.parameters)
@@ -84,6 +80,15 @@ class CountryTaxBenefitSystem(TaxBenefitSystem):
             self.parameters.gov.dwp
         )
 
+    def __init__(self, reform=None):
+        super().__init__(entities, reform=reform)
+
+        self.parameters_dir = COUNTRY_DIR / "parameters"
+
+        self.load_parameters(self.parameters_dir)
+
+        self.process_parameters(reform=reform)
+
 
 system = CountryTaxBenefitSystem()
 
@@ -108,6 +113,22 @@ class Simulation(CoreSimulation):
         if reform is not None:
             self.apply_reform(reform)
 
+        if kwargs.get("reform") is not None:
+            if any(
+                [
+                    "obr" in param
+                    for param in kwargs["reform"]
+                    if isinstance(kwargs["reform"], dict)
+                ]
+            ):
+                self.tax_benefit_system.load_parameters(
+                    self.tax_benefit_system.parameters_dir
+                )
+                Reform.from_dict(kwargs["reform"]).apply(
+                    self.tax_benefit_system
+                )
+                self.tax_benefit_system.process_parameters()
+
         # Labor supply responses
 
         employment_income = self.get_holder("employment_income")
@@ -147,6 +168,22 @@ class Microsimulation(CoreMicrosimulation):
         if reform is not None:
             self.apply_reform(reform)
 
+        if kwargs.get("reform") is not None:
+            if any(
+                [
+                    "obr" in param
+                    for param in kwargs["reform"]
+                    if isinstance(kwargs["reform"], dict)
+                ]
+            ):
+                self.tax_benefit_system.load_parameters(
+                    self.tax_benefit_system.parameters_dir
+                )
+                Reform.from_dict(kwargs["reform"]).apply(
+                    self.tax_benefit_system
+                )
+                self.tax_benefit_system.process_parameters()
+
         # Labor supply responses
 
         for simulation in list(self.branches.values()) + [self]:

{policyengine_uk-2.22.2 → policyengine_uk-2.22.4}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="PolicyEngine-UK",
-    version="2.22.2",
+    version="2.22.4",
     author="PolicyEngine",
     author_email="nikhil@policyengine.org",
     classifiers=[