From 93cfe7e11e4c87d6b1d4121f24b3adbc37125998 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Thu, 17 Jul 2025 11:07:15 +0100 Subject: [PATCH] Move to the FRS 2023-24 Fixes #172 --- changelog_entry.yaml | 4 ++++ policyengine/utils/data/datasets.py | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29b..b47ba458 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: minor + changes: + fixed: + - Updated the UK data to the latest survey year. diff --git a/policyengine/utils/data/datasets.py b/policyengine/utils/data/datasets.py index 7f173bb7..e4ed682b 100644 --- a/policyengine/utils/data/datasets.py +++ b/policyengine/utils/data/datasets.py @@ -2,15 +2,15 @@ from typing import Tuple, Optional -EFRS_2022 = "gs://policyengine-uk-data-private/enhanced_frs_2022_23.h5" -FRS_2022 = "gs://policyengine-uk-data-private/frs_2022_23.h5" +EFRS_2023 = "gs://policyengine-uk-data-private/enhanced_frs_2023_24.h5" +FRS_2023 = "gs://policyengine-uk-data-private/frs_2023_24.h5" CPS_2023 = "gs://policyengine-us-data/cps_2023.h5" CPS_2023_POOLED = "gs://policyengine-us-data/pooled_3_year_cps_2023.h5" ECPS_2024 = "gs://policyengine-us-data/enhanced_cps_2024.h5" POLICYENGINE_DATASETS = [ - EFRS_2022, - FRS_2022, + EFRS_2023, + FRS_2023, CPS_2023, CPS_2023_POOLED, ECPS_2024, @@ -28,7 +28,7 @@ def get_default_dataset( country: str, region: str, version: Optional[str] = None ) -> str: if country == "uk": - return EFRS_2022 + return EFRS_2023 elif country == "us": if region is not None and region != "us": return CPS_2023_POOLED