Merge pull request #19 from PolicyEngine/fix-data-downloads

Fix data download URLs
PolicyEngine · Sep 18, 2024 · dace650 · dace650
2 parents 61435c1 + b50bac3
commit dace650
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.1] - 2024-09-18 10:05:45
+
+### Fixed
+
+- Data download URLs.
+
 ## [1.2.0] - 2024-09-18 00:32:05
 
 ### Fixed
@@ -25,5 +31,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[1.2.1]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.0.0...1.1.0
diff --git a/changelog.yaml b/changelog.yaml
@@ -13,3 +13,8 @@
     fixed:
     - Compatibility with PolicyEngine UK.
   date: 2024-09-18 00:32:05
+- bump: patch
+  changes:
+    fixed:
+    - Data download URLs.
+  date: 2024-09-18 10:05:45
diff --git a/policyengine_uk_data/datasets/frs/enhanced_frs.py b/policyengine_uk_data/datasets/frs/enhanced_frs.py
@@ -38,7 +38,7 @@ class ReweightedFRS_2022_23(EnhancedFRS):
     input_frs = FRS_2022_23
     time_period = 2022
     end_year = 2022
-    url = "release://PolicyEngine/ukda/reweighted_frs_2022_23.h5"
+    url = "release://PolicyEngine/ukda/release/reweighted_frs_2022_23.h5"
 
 
 class EnhancedFRS_2022_23(EnhancedFRS):
@@ -49,7 +49,7 @@ class EnhancedFRS_2022_23(EnhancedFRS):
     input_frs = ExtendedFRS_2022_23
     time_period = 2022
     end_year = 2028
-    url = "release://PolicyEngine/ukda/enhanced_frs_2022_23.h5"
+    url = "release://PolicyEngine/ukda/release/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
@@ -94,7 +94,7 @@ class ExtendedFRS_2022_23(ExtendedFRS):
     data_format = Dataset.TIME_PERIOD_ARRAYS
     input_frs = FRS_2022_23
     time_period = 2022
-    url = "release://PolicyEngine/ukda/extended_frs_2022_23.h5"
+    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
@@ -116,7 +116,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/frs_2022_23.h5"
+    url = "release://PolicyEngine/ukda/release/frs_2022_23.h5"
 
 
 def add_id_variables(frs: h5py.File, person: DataFrame, household: DataFrame):

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "policyengine_uk_data"
-version = "1.2.0"
+version = "1.2.1"
 description = "A package to create representative microdata for the UK."
 readme = "README.md"
 authors = [