Fix budget change bugs (#967)

* Remove old notebooks * Move budget changes to the main model * Fix Use actual HBAI poverty rate definition #963 * Versioning * Versioning * Remove old test
PolicyEngine · Oct 19, 2024 · 03b1c8b · 03b1c8b
1 parent a1d51f2
commit 03b1c8b
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 438 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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
@@ -1512,6 +1518,7 @@ 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

diff --git a/changelog.yaml b/changelog.yaml
@@ -1269,3 +1269,8 @@
     changed:
     - UK data package bumped to 1.6.
   date: 2024-10-19 09:27:21
+- bump: minor
+  changes:
+    fixed:
+    - Bug in budget change reforms.
+  date: 2024-10-19 19:58:09
diff --git a/emp_ni_test.ipynb b/emp_ni_test.ipynb
diff --git a/employer_ni.ipynb b/employer_ni.ipynb
diff --git a/employer_ni_example.ipynb b/employer_ni_example.ipynb
diff --git a/policyengine_uk/reforms/policyengine/__init__.py b/policyengine_uk/reforms/policyengine/__init__.py
@@ -1,2 +1 @@
-from .budget_change import *
 from .disable_simulated_benefits import *
diff --git a/policyengine_uk/reforms/reforms.py b/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))

diff --git a/policyengine_uk/tests/policy/baseline/demographic/poverty.yaml b/policyengine_uk/tests/policy/baseline/demographic/poverty.yaml
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		from .budget_change import *
		from .disable_simulated_benefits import *