From 32f2feeb0460bd907c179411b1245bb550f018b0 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Sun, 13 Jul 2025 18:12:00 +0100 Subject: [PATCH 1/3] Entity tables incorrectly don't load year data Fixes #1219 --- changelog_entry.yaml | 4 ++++ policyengine_uk/data/dataset_schema.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29bb..fbf2c04bd 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + fixed: + - Bug in loading entity tables. diff --git a/policyengine_uk/data/dataset_schema.py b/policyengine_uk/data/dataset_schema.py index f85619264..418186cb5 100644 --- a/policyengine_uk/data/dataset_schema.py +++ b/policyengine_uk/data/dataset_schema.py @@ -57,9 +57,9 @@ def __init__( self.person = person self.benunit = benunit self.household = household + self.time_period = fiscal_year self.data_format = "arrays" - self.time_period = fiscal_year self.tables = (self.person, self.benunit, self.household) def save(self, file_path: str): From 9df8425bca7ad2a12a6f32694469423aa8583872 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Sun, 13 Jul 2025 18:15:32 +0100 Subject: [PATCH 2/3] Cast to string for safety --- policyengine_uk/data/dataset_schema.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/policyengine_uk/data/dataset_schema.py b/policyengine_uk/data/dataset_schema.py index 418186cb5..fdfb9abd1 100644 --- a/policyengine_uk/data/dataset_schema.py +++ b/policyengine_uk/data/dataset_schema.py @@ -48,7 +48,7 @@ def __init__( self.person = f["person"] self.benunit = f["benunit"] self.household = f["household"] - self.time_period = f["time_period"].iloc[0] + self.time_period = str(f["time_period"].iloc[0]) else: if person is None or benunit is None or household is None: raise ValueError( @@ -57,7 +57,7 @@ def __init__( self.person = person self.benunit = benunit self.household = household - self.time_period = fiscal_year + self.time_period = str(fiscal_year) self.data_format = "arrays" self.tables = (self.person, self.benunit, self.household) From 581e12b8426d54ff51f5232d739f6ff760894dd2 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Sun, 13 Jul 2025 18:23:04 +0100 Subject: [PATCH 3/3] Remove debug steps --- .github/workflows/pr_code_changes.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/pr_code_changes.yaml b/.github/workflows/pr_code_changes.yaml index bc2c93975..e63a4d908 100644 --- a/.github/workflows/pr_code_changes.yaml +++ b/.github/workflows/pr_code_changes.yaml @@ -50,13 +50,5 @@ jobs: run: make test env: HUGGING_FACE_TOKEN: ${{ secrets.HUGGING_FACE_TOKEN }} - - name: Update tests - run: make update-tests - env: - HUGGING_FACE_TOKEN: ${{ secrets.HUGGING_FACE_TOKEN }} - - name: Save dataset - run: make update-tests - env: - HUGGING_FACE_TOKEN: ${{ secrets.HUGGING_FACE_TOKEN }} - name: Test documentation builds run: make documentation \ No newline at end of file