From 89b035d2bd10b81da5714fbbe5da3edd5abe7316 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff <35577657+nikhilwoodruff@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:20:17 +0100 Subject: [PATCH] Fix bug removing capital gains (#40) --- CHANGELOG.md | 7 +++++++ changelog.yaml | 5 +++++ policyengine_uk_data/datasets/frs/enhanced_frs.py | 2 +- policyengine_uk_data/datasets/frs/frs.py | 2 +- pyproject.toml | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db7f41b..bdcd49c 100644 --- 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). +## [1.9.0] - 2024-10-22 11:18:48 + +### Fixed + +- Bug removing capital gains. + ## [1.8.0] - 2024-10-22 08:30:52 ### Changed @@ -85,6 +91,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 +[1.9.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.8.0...1.9.0 [1.8.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.7.0...1.8.0 [1.7.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.6.0...1.7.0 [1.6.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.5.0...1.6.0 diff --git a/changelog.yaml b/changelog.yaml index 229c8b6..142c9c7 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -70,3 +70,8 @@ changed: - Data URLs updated. date: 2024-10-22 08:30:52 +- bump: minor + changes: + fixed: + - Bug removing capital gains. + date: 2024-10-22 11:18:48 diff --git a/policyengine_uk_data/datasets/frs/enhanced_frs.py b/policyengine_uk_data/datasets/frs/enhanced_frs.py index fb33232..e8e3253 100644 --- a/policyengine_uk_data/datasets/frs/enhanced_frs.py +++ b/policyengine_uk_data/datasets/frs/enhanced_frs.py @@ -84,7 +84,7 @@ class EnhancedFRS_2022_23(EnhancedFRS): input_frs = ExtendedFRS_2022_23 time_period = 2022 end_year = 2028 - url = "release://PolicyEngine/ukda/1.8.0/enhanced_frs_2022_23.h5" + url = "release://PolicyEngine/ukda/1.9.0/enhanced_frs_2022_23.h5" def reweight( diff --git a/policyengine_uk_data/datasets/frs/frs.py b/policyengine_uk_data/datasets/frs/frs.py index 147747b..8d850b5 100644 --- a/policyengine_uk_data/datasets/frs/frs.py +++ b/policyengine_uk_data/datasets/frs/frs.py @@ -138,7 +138,7 @@ class FRS_2022_23(FRS): label = "FRS (2022-23)" file_path = STORAGE_FOLDER / "frs_2022_23.h5" time_period = 2022 - url = "release://PolicyEngine/ukda/1.8.0/frs_2022_23.h5" + url = "release://PolicyEngine/ukda/1.9.0/frs_2022_23.h5" def add_id_variables(frs: h5py.File, person: DataFrame, household: DataFrame): diff --git a/pyproject.toml b/pyproject.toml index 5fdd78d..dae1cb8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "policyengine_uk_data" -version = "1.8.0" +version = "1.9.0" description = "A package to create representative microdata for the UK." readme = "README.md" authors = [