Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bugs #983

Merged
merged 4 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ 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.13.0] - 2024-10-24 11:42:25

### Fixed

- Bug causing household app crashes.
- Metadat for OBR parameters.

## [2.12.0] - 2024-10-23 14:47:21

### Added
Expand Down Expand Up @@ -1554,6 +1561,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0



[2.13.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.12.0...2.13.0
[2.12.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.11.0...2.12.0
[2.11.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.10.0...2.11.0
[2.10.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.9.0...2.10.0
Expand Down
6 changes: 6 additions & 0 deletions changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1304,3 +1304,9 @@
added:
- Capital Gains Tax elasticities.
date: 2024-10-23 14:47:21
- bump: minor
changes:
fixed:
- Bug causing household app crashes.
- Metadat for OBR parameters.
date: 2024-10-24 11:42:25
1 change: 0 additions & 1 deletion policyengine_uk/parameters/gov/obr/average_earnings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ values:
2028-01-01: 168.9
2029-01-01: 173.3 # Projected
metadata:
unit: /1
reference:
- title: OBR March 2024 EFO
href: https://obr.uk/efo/economic-and-fiscal-outlook-march-2024/
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ values:
2028-01-01: 143.7
2029-01-01: 146.6 # Projected
metadata:
unit: /1
reference:
- title: OBR March 2024 EFO
href: https://obr.uk/efo/economic-and-fiscal-outlook-march-2024/
1 change: 0 additions & 1 deletion policyengine_uk/parameters/gov/obr/house_prices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ values:
2028-01-01: 159.5
2029-01-01: 165.7 # Projected
metadata:
unit: currency-GBP
reference:
- title: OBR March 2024 EFO
href: https://obr.uk/efo/economic-and-fiscal-outlook-march-2024/
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ values:
2028-01-01: 1.461
2029-01-01: 1.497 # Projected
metadata:
unit: currency-GBP
reference: OBR
label: Food and beverages inflation
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ values:
2028-01-01: 1.365
2029-01-01: 1.418 # Projected
metadata:
unit: currency-GBP
reference: OBR
label: Utilities inflation
1 change: 0 additions & 1 deletion policyengine_uk/parameters/gov/obr/mortgage_interest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ values:
2028-01-01: 125.2
2029-01-01: 130.7 # Projected
metadata:
unit: currency-GBP
reference:
- title: OBR March 2024 EFO
href: https://obr.uk/efo/economic-and-fiscal-outlook-march-2024/
7 changes: 7 additions & 0 deletions policyengine_uk/variables/household/income/income.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,13 @@ class household_net_income(Variable):
definition_period = YEAR
value_type = float
unit = GBP
adds = [
"household_market_income",
"household_benefits",
]
subtracts = [
"household_tax",
]

def formula(household, period, parameters):
market_income = household("household_market_income", period)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name="PolicyEngine-UK",
version="2.12.0",
version="2.13.0",
author="PolicyEngine",
author_email="nikhil@policyengine.org",
classifiers=[
Expand Down
Loading