Skip to content

Commit

Permalink
Update URLs
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhilwoodruff committed Oct 15, 2024
1 parent 4365b1d commit 33703be
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ test:
pytest

install:
pip install policyengine-uk==2.1.1
pip install -e ".[dev]"

download:
Expand Down
5 changes: 5 additions & 0 deletions changelog_entry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- bump: minor
changes:
added:
- 5% dropout in calibration.
- Code quality improvements.
3 changes: 1 addition & 2 deletions policyengine_uk_data/datasets/frs/enhanced_frs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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(
Expand Down
1 change: 0 additions & 1 deletion policyengine_uk_data/datasets/frs/extended_frs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion policyengine_uk_data/datasets/frs/frs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,20 @@ dependencies = [
"requests",
"tqdm",
"tabulate",
"build",
]

[project.optional-dependencies]
dev = [
"black",
"pytest",
"policyengine_uk>=1.8.0",
"torch",
"tables",
"furo",
"jupyter-book",
"yaml-changelog>=0.1.7",
"itables",
"quantile-forest",
"build",
]

[tool.setuptools]
Expand Down

0 comments on commit 33703be

Please sign in to comment.