Skip to content

Commit

Permalink
Versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhilwoodruff committed Dec 4, 2024
1 parent 88e7404 commit 774c93b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.17.0] - 2024-12-04 16:48:42

### Fixed

- Scottish baseline matched with Scottish Fiscal Commission.

## [2.16.0] - 2024-11-28 16:54:41

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



[2.17.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.16.0...2.17.0
[2.16.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.15.1...2.16.0
[2.15.1]: https://github.com/PolicyEngine/openfisca-uk/compare/2.15.0...2.15.1
[2.15.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.14.1...2.15.0
Expand Down
5 changes: 5 additions & 0 deletions changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1345,3 +1345,8 @@
changed:
- Pinned UK data to 1.9.0.
date: 2024-11-28 16:54:41
- bump: minor
changes:
fixed:
- Scottish baseline matched with Scottish Fiscal Commission.
date: 2024-12-04 16:48:42
2 changes: 2 additions & 0 deletions policyengine_uk/variables/household/income/income.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ def formula(household, period, parameters):
housing_costs = household("housing_costs", period)
return np.round(market_income + benefits - tax - housing_costs)


class inflation_adjustment(Variable):
label = (
f"inflation multiplier to get {datetime.datetime.now().year} prices"
Expand Down Expand Up @@ -266,6 +267,7 @@ def formula(household, period, parameters):
net_income = household("household_net_income_ahc", period)
return net_income * household("inflation_adjustment", period)


class hbai_household_net_income_ahc(Variable):
value_type = float
entity = Household
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.16.0",
version="2.17.0",
author="PolicyEngine",
author_email="nikhil@policyengine.org",
classifiers=[
Expand Down

0 comments on commit 774c93b

Please sign in to comment.