policyengine-uk 2.40.0__py3-none-any.whl → 2.40.2__py3-none-any.whl

policyengine_uk/data/dataset_schema.py

@@ -213,12 +213,11 @@ class UKMultiYearDataset:
 
         # Check if the file contains datasets for multiple years
         with h5py.File(file_path, "r") as f:
-            if not any(key.startswith("/person/") for key in f.keys()):
-                raise ValueError("No person dataset found in the file.")
-            if not any(key.startswith("/benunit/") for key in f.keys()):
-                raise ValueError("No benunit dataset found in the file.")
-            if not any(key.startswith("/household/") for key in f.keys()):
-                raise ValueError("No household dataset found in the file.")
+            for required_dataset in ["person", "benunit", "household"]:
+                if not any(f"{required_dataset}" in key for key in f.keys()):
+                    raise ValueError(
+                        f"Dataset '{required_dataset}' not found in the file: {file_path}"
+                    )
 
     def load(self):
         data = {}

policyengine_uk/data/economic_assumptions.py

@@ -48,7 +48,9 @@ def apply_single_year_uprating(
                     prev_year_value = getattr(previous_year, table_name)[
                         variable
                     ]
-                    current_year_value = prev_year_value * index_rel_change
+                    current_year_value = prev_year_value * (
+                        1 + index_rel_change
+                    )
                     getattr(current_year, table_name)[
                         variable
                     ] = current_year_value
@@ -158,11 +160,6 @@ def uprate_rent(
         private_rent_growth = (
             aggregate_growth - social_weight * social_rent_growth
         ) / private_weight
-        print(
-            f"Backed out private rent growth: {private_rent_growth:.1%} in {year}"
-        )
-        print(f"OBR aggregate rent growth: {aggregate_growth:.1%} in {year}")
-        print(f"Social rent growth: {social_rent_growth:.1%} in {year}")
 
         current_year.household["rent"] = np.where(
             is_private_rented,
@@ -182,3 +179,6 @@ def reset_uprating(
     for year in dataset.datasets:
         if year != first_year:
             dataset.datasets[year] = dataset.datasets[first_year].copy()
+            dataset.datasets[year].time_period = str(year)
+
+    return dataset

policyengine_uk/system.py

@@ -202,9 +202,13 @@ class Microsimulation(CoreMicrosimulation):
                             dataset = UKMultiYearDataset(
                                 file_path=dataset_file_path
                             )
-                        except:
+                        except Exception as e:
                             pass
-                        dataset = Dataset.from_file(dataset_file_path)
+
+                        if not isinstance(
+                            dataset, (UKSingleYearDataset, UKMultiYearDataset)
+                        ):
+                            dataset = Dataset.from_file(dataset_file_path)
 
         super().__init__(*args, dataset=dataset, **kwargs)
 

policyengine_uk/tests/microsimulation/reforms_config.yaml

@@ -4,7 +4,7 @@ reforms:
   parameters:
     gov.hmrc.income_tax.rates.uk[0].rate: 0.21
 - name: Raise higher rate by 1pp
-  expected_impact: 4.8
+  expected_impact: 4.7
   parameters:
     gov.hmrc.income_tax.rates.uk[1].rate: 0.42
 - name: Raise personal allowance by ~800GBP/year
@@ -16,7 +16,7 @@ reforms:
   parameters:
     gov.hmrc.child_benefit.amount.additional: 25
 - name: Reduce Universal Credit taper rate to 20%
-  expected_impact: -36.5
+  expected_impact: -36.6
   parameters:
     gov.dwp.universal_credit.means_test.reduction_rate: 0.2
 - name: Raise Class 1 main employee NICs rate to 10%
@@ -28,6 +28,6 @@ reforms:
   parameters:
     gov.hmrc.vat.standard_rate: 0.22
 - name: Raise additional rate by 3pp
-  expected_impact: 5.5
+  expected_impact: 5.4
   parameters:
     gov.hmrc.income_tax.rates.uk[2].rate: 0.48

{policyengine_uk-2.40.0.data → policyengine_uk-2.40.2.data}/data/share/openfisca/openfisca-country-template/CHANGELOG.md

@@ -5,6 +5,18 @@ 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).
 
+## [2.40.2] - 2025-07-22 09:37:07
+
+### Fixed
+
+- Bug in uprating.
+
+## [2.40.1] - 2025-07-21 15:37:49
+
+### Fixed
+
+- Bug in handling downloads of UKMultiYearDataset from HuggingFace.
+
 ## [2.40.0] - 2025-07-21 13:23:31
 
 ### Added
@@ -1974,6 +1986,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[2.40.2]: https://github.com/PolicyEngine/openfisca-uk/compare/2.40.1...2.40.2
+[2.40.1]: https://github.com/PolicyEngine/openfisca-uk/compare/2.40.0...2.40.1
 [2.40.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.39.3...2.40.0
 [2.39.3]: https://github.com/PolicyEngine/openfisca-uk/compare/2.39.2...2.39.3
 [2.39.2]: https://github.com/PolicyEngine/openfisca-uk/compare/2.39.1...2.39.2

{policyengine_uk-2.40.0.dist-info → policyengine_uk-2.40.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine-uk
-Version: 2.40.0
+Version: 2.40.2
 Summary: PolicyEngine tax and benefit system for the UK
 Project-URL: Homepage, https://github.com/PolicyEngine/policyengine-uk
 Project-URL: Repository, https://github.com/PolicyEngine/policyengine-uk

{policyengine_uk-2.40.0.dist-info → policyengine_uk-2.40.2.dist-info}/RECORD

@@ -3,10 +3,10 @@ policyengine_uk/entities.py,sha256=9yUbkUWQr3WydNE-gHhUudG97HGyXIZY3dkgQ6Z3t9A,1
 policyengine_uk/model_api.py,sha256=D5OuQpQbdBXiF6r7LvCLWjsTkAWtkeBJWz2ebsJ-GN0,189
 policyengine_uk/modelled_policies.yaml,sha256=TLhvmkuI9ip-Fjq63n66RzDErCkN8K4BzY6XLxLMtFg,463
 policyengine_uk/repo.py,sha256=-dqpIMUD7UUj94ql9XwaMrFJUYKvNhFQ_9uj83Z8uh0,55
-policyengine_uk/system.py,sha256=wsMtkWDneSTJ2M4UZcBWTjZ-0rRyt2IfTbp255mQ7cM,9550
+policyengine_uk/system.py,sha256=jfMN-0cDBMsbqIgTenRxCblSY3o69YIeSWGFaBgF76s,9719
 policyengine_uk/data/__init__.py,sha256=J0bZ3WnvPzZ4qfVLYcwOc4lziMUMdbcMqJ3xwjoekbM,101
-policyengine_uk/data/dataset_schema.py,sha256=C178v_9OGqx2WXRFfpi3WzdekFuuTB0ulHyTleHB4hM,8357
-policyengine_uk/data/economic_assumptions.py,sha256=YOwoY2Id5Zrhvz5hFbjZEc-maPCzNvNgsVD7xXzu5v4,5825
+policyengine_uk/data/dataset_schema.py,sha256=aiBxxEwuYQ5TobkX1U8PM0sQK9c58MGJHnHfL2Aymso,8215
+policyengine_uk/data/economic_assumptions.py,sha256=ZZ0sXqhYKjfCkcMZhutZgnvI3cWqC_wfwWocMWpniso,5697
 policyengine_uk/data/uprating_indices.yaml,sha256=kQtfeGWyqge4dbJhs0iF4kTMqovuegill_Zfs8orJi4,2394
 policyengine_uk/parameters/gov/README.md,sha256=bHUep1_2pLHD3Or8SwjStOWXDIbW9OuYxOd4ml8IXcM,13
 policyengine_uk/parameters/gov/benefit_uprating_cpi.yaml,sha256=2zOSdJeUhDZYYsKE2vLkcK-UbKNoOSVwfac0QIAp02g,250
@@ -528,7 +528,7 @@ policyengine_uk/reforms/policyengine/disable_simulated_benefits.py,sha256=siEs1E
 policyengine_uk/tests/test_parameter_metadata.py,sha256=_2w2dSokAf5Jskye_KIL8eh80N7yIrUszlmqnZtwQws,450
 policyengine_uk/tests/code_health/test_variables.py,sha256=9Y-KpmzhyRGy9eEqocK9z91NXHX5QIF3mDMNGvegb7Q,1398
 policyengine_uk/tests/microsimulation/README.md,sha256=1toB1Z06ynlUielTrsAaeo9Vb-c3ZrB3tbbR4E1xUGk,3924
-policyengine_uk/tests/microsimulation/reforms_config.yaml,sha256=lHBXxuYDtpS5oTfpZEv-9E-o-UZiCn7zf824xvQQ4_s,1086
+policyengine_uk/tests/microsimulation/reforms_config.yaml,sha256=xM7x1KxctM0equ4z4kd32bfcMgQC87pNFhF6n0hlYkQ,1086
 policyengine_uk/tests/microsimulation/test_reform_impacts.py,sha256=xM3M2pclEhA9JIFpnuiPMy1fEBFOKcSzroRPk73FPls,2635
 policyengine_uk/tests/microsimulation/test_validity.py,sha256=RWhbSKrnrZCNQRVmGYlM8hnpe1_Blo5_xP8vr8u3kV0,694
 policyengine_uk/tests/microsimulation/update_reform_impacts.py,sha256=2pxp2RNLWxV4CesGKKHmg3qBs79Jq2Jcq3GJIBk4euU,4824
@@ -1367,10 +1367,10 @@ policyengine_uk/variables/misc/spi_imputed.py,sha256=iPVlBF_TisM0rtKvO-3-PQ2UYCe
 policyengine_uk/variables/misc/uc_migrated.py,sha256=zFNcUJaO8gwmbL1iY9GKgUt3G6J9yrCraqBV_5dCvlM,306
 policyengine_uk/variables/misc/categories/lower_middle_or_higher.py,sha256=C54tHYz2DmOyvQYCC1bF8RJwRZinhAq_e3aYC-9F5fM,157
 policyengine_uk/variables/misc/categories/lower_or_higher.py,sha256=81NIbLLabRr9NwjpUZDuV8IV8_mqmp5NM-CZvt55TwE,129
-policyengine_uk-2.40.0.data/data/share/openfisca/openfisca-country-template/CHANGELOG.md,sha256=2G0rtwRDXgWe4UU8Fkg_BOscYoCOzL0seIj5y3dr7JA,57061
-policyengine_uk-2.40.0.data/data/share/openfisca/openfisca-country-template/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-policyengine_uk-2.40.0.data/data/share/openfisca/openfisca-country-template/README.md,sha256=PCy7LRLdUDQS8U4PaeHeBVnyBZAqHv1dAVDDvEcom20,1976
-policyengine_uk-2.40.0.dist-info/METADATA,sha256=zjGj02SFc6sRVUcXo3SjQpYAcXpt8fiOSs6xO3DR58I,3502
-policyengine_uk-2.40.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_uk-2.40.0.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-policyengine_uk-2.40.0.dist-info/RECORD,,
+policyengine_uk-2.40.2.data/data/share/openfisca/openfisca-country-template/CHANGELOG.md,sha256=f_pHmbpczLD3yYXk88xFa8hOqd01GrFTDn9qj6e7PLg,57400
+policyengine_uk-2.40.2.data/data/share/openfisca/openfisca-country-template/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+policyengine_uk-2.40.2.data/data/share/openfisca/openfisca-country-template/README.md,sha256=PCy7LRLdUDQS8U4PaeHeBVnyBZAqHv1dAVDDvEcom20,1976
+policyengine_uk-2.40.2.dist-info/METADATA,sha256=6IU84cfFQfAsM7MNkdL-dG384DSMB-EnbGgmB0UGSwg,3502
+policyengine_uk-2.40.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_uk-2.40.2.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+policyengine_uk-2.40.2.dist-info/RECORD,,