From 34bfb2b5361b2a0d05e90051a1c9e26b2bd4485b Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Mon, 14 Jul 2025 23:03:08 +0100 Subject: [PATCH 1/3] Add improvements to UKDataset --- policyengine_uk/data/dataset_schema.py | 2 ++ policyengine_uk/system.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/policyengine_uk/data/dataset_schema.py b/policyengine_uk/data/dataset_schema.py index 683913aea..9eed2afd4 100644 --- a/policyengine_uk/data/dataset_schema.py +++ b/policyengine_uk/data/dataset_schema.py @@ -43,6 +43,7 @@ def __init__( fiscal_year: int = 2025, ): if file_path is not None: + file_path = str(file_path) self.validate_file_path(file_path) with pd.HDFStore(file_path) as f: self.person = f["person"] @@ -84,6 +85,7 @@ def copy(self): person=self.person.copy(), benunit=self.benunit.copy(), household=self.household.copy(), + fiscal_year=self.time_period, ) def validate(self): diff --git a/policyengine_uk/system.py b/policyengine_uk/system.py index a336a7a45..f627d7f94 100644 --- a/policyengine_uk/system.py +++ b/policyengine_uk/system.py @@ -185,6 +185,9 @@ def __init__(self, *args, dataset=ENHANCED_FRS, **kwargs): try: UKDataset.validate_file_path(dataset_file_path) dataset = UKDataset(file_path=dataset_file_path) + self.default_calculation_period = ( + dataset.time_period + ) except: dataset = Dataset.from_file(dataset_file_path) From 27db9d835289a644bd69b4e1ba3cc5a6b4645c38 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Mon, 14 Jul 2025 23:03:26 +0100 Subject: [PATCH 2/3] Versioning --- changelog_entry.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29bb..af36ed9b9 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + fixed: + - Improvements to UKDataset. From b4a49adaec4146c9ecbf143809766a58a7c315f9 Mon Sep 17 00:00:00 2001 From: policyengine-bot Date: Mon, 8 Dec 2025 21:42:59 +0000 Subject: [PATCH 3/3] Fix duplicate line from merge --- policyengine_uk/data/dataset_schema.py | 1 - 1 file changed, 1 deletion(-) diff --git a/policyengine_uk/data/dataset_schema.py b/policyengine_uk/data/dataset_schema.py index 6637805a1..fd4c8efab 100644 --- a/policyengine_uk/data/dataset_schema.py +++ b/policyengine_uk/data/dataset_schema.py @@ -55,7 +55,6 @@ def __init__( ): file_path = str(file_path) if file_path else None if file_path is not None: - file_path = str(file_path) self.validate_file_path(file_path) with pd.HDFStore(file_path) as f: self.person = f["person"]