diff --git a/Makefile b/Makefile index 975f206..f56d1e7 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ test: pytest install: + pip install policyengine-uk==2.1.1 pip install -e ".[dev]" download: diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29..af5448c 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,5 @@ +- bump: minor + changes: + added: + - 5% dropout in calibration. + - Code quality improvements. diff --git a/policyengine_uk_data/datasets/frs/enhanced_frs.py b/policyengine_uk_data/datasets/frs/enhanced_frs.py index d92f337..f0f5727 100644 --- a/policyengine_uk_data/datasets/frs/enhanced_frs.py +++ b/policyengine_uk_data/datasets/frs/enhanced_frs.py @@ -46,7 +46,6 @@ class ReweightedFRS_2022_23(EnhancedFRS): input_frs = FRS_2022_23 time_period = 2022 end_year = 2022 - url = "release://PolicyEngine/ukda/release/reweighted_frs_2022_23.h5" class EnhancedFRS_2022_23(EnhancedFRS): @@ -57,7 +56,7 @@ class EnhancedFRS_2022_23(EnhancedFRS): input_frs = ExtendedFRS_2022_23 time_period = 2022 end_year = 2028 - url = "release://PolicyEngine/ukda/release/enhanced_frs_2022_23.h5" + url = "release://PolicyEngine/ukda/1.3.0/enhanced_frs_2022_23.h5" def reweight( diff --git a/policyengine_uk_data/datasets/frs/extended_frs.py b/policyengine_uk_data/datasets/frs/extended_frs.py index fecb316..6239a86 100644 --- a/policyengine_uk_data/datasets/frs/extended_frs.py +++ b/policyengine_uk_data/datasets/frs/extended_frs.py @@ -97,7 +97,6 @@ class ExtendedFRS_2022_23(ExtendedFRS): data_format = Dataset.TIME_PERIOD_ARRAYS input_frs = FRS_2022_23 time_period = 2022 - url = "release://PolicyEngine/ukda/release/extended_frs_2022_23.h5" if __name__ == "__main__": diff --git a/policyengine_uk_data/datasets/frs/frs.py b/policyengine_uk_data/datasets/frs/frs.py index 22ea303..2862df3 100644 --- a/policyengine_uk_data/datasets/frs/frs.py +++ b/policyengine_uk_data/datasets/frs/frs.py @@ -115,7 +115,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/release/frs_2022_23.h5" + url = "release://PolicyEngine/ukda/1.3.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 3cd3f4b..4ecb069 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,14 +17,12 @@ dependencies = [ "requests", "tqdm", "tabulate", - "build", ] [project.optional-dependencies] dev = [ "black", "pytest", - "policyengine_uk>=1.8.0", "torch", "tables", "furo", @@ -32,6 +30,7 @@ dev = [ "yaml-changelog>=0.1.7", "itables", "quantile-forest", + "build", ] [tool.setuptools]