diff --git a/changelog.d/certify-uk-2.153.4-1.58.2.changed.md b/changelog.d/certify-uk-2.153.4-1.58.2.changed.md new file mode 100644 index 000000000..115c06547 --- /dev/null +++ b/changelog.d/certify-uk-2.153.4-1.58.2.changed.md @@ -0,0 +1 @@ +Certify uk-data 1.58.2 (`enhanced_frs_2024_25`) with policyengine-uk 2.153.4 and policyengine-core 3.33.3, qualified automatically as pair `0f2daf676b1e`. No publisher claim covers this model version, so the certificate is an exact claim backed by the qualification receipt. diff --git a/pyproject.toml b/pyproject.toml index 5bb36c0a5..f4ec29748 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,12 +42,12 @@ graph = [ models = [ "policyengine-core==3.33.3", "policyengine-us==2.2.1", - "policyengine-uk==2.132.6", + "policyengine-uk==2.153.4", "spm-calculator==1.0.0", ] uk = [ "policyengine-core==3.33.3", - "policyengine-uk==2.132.6", + "policyengine-uk==2.153.4", ] us = [ "policyengine-core==3.33.3", @@ -72,7 +72,7 @@ dev = [ "rfc8785>=0.1.4", "policyengine-core==3.33.3", "policyengine-us==2.2.1", - "policyengine-uk==2.132.6", + "policyengine-uk==2.153.4", "spm-calculator==1.0.0", ] diff --git a/src/policyengine/data/bundle/manifest.json b/src/policyengine/data/bundle/manifest.json index e17db3ade..1bf3e2bf7 100644 --- a/src/policyengine/data/bundle/manifest.json +++ b/src/policyengine/data/bundle/manifest.json @@ -16,120 +16,103 @@ }, "data_releases": { "uk": { - "build_id": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", + "build_id": "policyengine-uk-data-1.58.2", "bundle_id": "uk-6.10.2", "certification": { - "built_with_model_version": "2.132.6", + "built_with_model_git_sha": "a43e8c5196c7e7c09b6ecb4924f034444dd83b8f", + "built_with_model_version": "2.122.2", "certified_by": "policyengine.py bundle certification", - "certified_for_model_version": "2.132.6", - "compatibility_basis": "built_with_model_package", - "core_binding": "bundle_pin", - "data_build_id": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71" + "certified_for_core_version": "3.33.3", + "certified_for_model_version": "2.153.4", + "compatibility_basis": "qualified_exact_pair", + "core_binding": "certified", + "data_build_fingerprint": "sha256:c094d7006fdd81df220090284212f16bbffb15624643bc442c4bb3e1b1e5dac8", + "data_build_id": "policyengine-uk-data-1.58.2", + "qualification_ledger_url": "https://github.com/PolicyEngine/policyengine.py/tree/uk-qualification-ledger/uk/0f2daf676b1edd84b82f0784e3ddac465ac1751805a77d712bc4e61cd6695b7e", + "qualification_pair_id": "0f2daf676b1edd84b82f0784e3ddac465ac1751805a77d712bc4e61cd6695b7e" }, "certified_data_artifact": { - "build_id": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", + "build_id": "policyengine-uk-data-1.58.2", "data_package": { - "name": "microcosm-data", - "version": "0.1.0" + "name": "policyengine-uk-data", + "version": "1.58.2" }, - "dataset": "microcosm_uk_2024_25", - "sha256": "810ba980005a8b907cb51464279fa5e0125464b7af9a4871b7f6744c30951ece", - "uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71" + "dataset": "enhanced_frs_2024_25", + "sha256": "40804ba2540458cb6f3c476d29d3bb4bc88d9ac6b401fa285ed6e4232a55aa52", + "uri": "hf://policyengine/policyengine-uk-data-private/enhanced_frs_2024_25.h5@1.58.2" }, "country_id": "uk", "data_package": { - "name": "microcosm-data", - "release_manifest_path": "releases/microcosm-uk-2024-25-national/release_manifest.json", - "release_manifest_revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "repo_id": "policyengine/populace-uk-private", - "repo_type": "dataset", - "version": "0.1.0" + "name": "policyengine-uk-data", + "release_manifest_path": "releases/1.58.2/release_manifest.json", + "release_manifest_revision": "a14737cd9499e1059cbec579ddf9aec3b3667ed1", + "repo_id": "policyengine/policyengine-uk-data-private", + "repo_type": "model", + "version": "1.58.2" }, "data_producer": "populace", "datasets": { - "calibration_diagnostics": { - "path": "releases/microcosm-uk-2024-25-national/calibration_diagnostics.json", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "34978e2bfde3f2641769c9c3a8f60455c59ecae5a50524b359d74388d7edc888" - }, - "microcosm_uk_2024_25": { - "path": "microcosm_uk_2024_25.h5", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "810ba980005a8b907cb51464279fa5e0125464b7af9a4871b7f6744c30951ece" - }, - "microcosm_uk_2024_25_calibration": { - "path": "microcosm_uk_2024_25_calibration.npz", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "104a8253bf1aebc91147c9bbb40e2603d1025317ba8c6b991383d5e4d91852c2" + "enhanced_frs_2024_25": { + "path": "enhanced_frs_2024_25.h5", + "repo_id": "policyengine/policyengine-uk-data-private", + "revision": "1.58.2", + "sha256": "40804ba2540458cb6f3c476d29d3bb4bc88d9ac6b401fa285ed6e4232a55aa52" }, - "microcosm_uk_2024_25_dense": { - "path": "microcosm_uk_2024_25_dense.h5", - "repo_id": "policyengine/populace-uk-private", - "repo_type": "dataset", - "revision": "microcosm-uk-2024-25-dense-20261019T000432Z-ee5c2dbe", - "sha256": "8e10e130d0260e0b52e2e29902f0502ebdff76a14a3e57d2c876bf4cd8db5872" + "enhanced_frs_2024_25_tiny": { + "path": "enhanced_frs_2024_25_tiny.h5", + "repo_id": "policyengine/policyengine-uk-data-private", + "revision": "1.58.2", + "sha256": "c0362e4661433cb42518161612be01b36b839d1dd5d87ed76bc4c0018a529bc9" }, - "release_certification": { - "path": "releases/microcosm-uk-2024-25-national/release_certification.json", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "6a68cc93595fc5a7ad451d75a902523c25659de27014f50431dd5e19af5bd959" + "frs_2024_25": { + "path": "frs_2024_25.h5", + "repo_id": "policyengine/policyengine-uk-data-private", + "revision": "1.58.2", + "sha256": "a9b59b888cd42c379b2975d48679b430c5196376dfb5fc698e21c42947d9a1a2" }, - "release_cut_gates": { - "path": "releases/microcosm-uk-2024-25-national/release_cut_gates.json", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "c91c1364d9c3be98493039d4e1dd8c2256881a434c1f124dd2ed0701bfaf7751" + "frs_2024_25_tiny": { + "path": "frs_2024_25_tiny.h5", + "repo_id": "policyengine/policyengine-uk-data-private", + "revision": "1.58.2", + "sha256": "75d28df5eba2dc82c82b39ac66fc8536d4a00f507690b2c73f873aef3f011956" }, - "score_vs_enhanced_frs": { - "path": "releases/microcosm-uk-2024-25-national/score_vs_enhanced_frs.json", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "ba8a675f36e7c836bf5521e5933e21bb689442734b7340e05cabd3e0cc55323d" + "local_authority_weights": { + "path": "local_authority_weights.h5", + "repo_id": "policyengine/policyengine-uk-data-private", + "revision": "1.58.2", + "sha256": "7afe530447cd1488c1bb5d583307b015d88472012be2b383472545d988426c33" }, - "spine_gates": { - "path": "releases/microcosm-uk-2024-25-national/spine_gates.json", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "6dbba976dd1304c07da531382cecb11c9cb69512de0ee65126b71f032a0f37d6" + "local_geography_weights": { + "path": "local_geography_weights.csv.gz", + "repo_id": "policyengine/policyengine-uk-data-private", + "revision": "1.58.2", + "sha256": "be9679281a0674f6e91092d357b0149adab47a0f67f7fec889686c767f090e96" }, - "terminal_gates": { - "path": "releases/microcosm-uk-2024-25-national/terminal_gates.json", - "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", - "sha256": "e29439d5ce0ea098d32579284ac06f26f086feba2fb8d12d1e88ac9a54840808" + "parliamentary_constituency_weights": { + "path": "parliamentary_constituency_weights.h5", + "repo_id": "policyengine/policyengine-uk-data-private", + "revision": "1.58.2", + "sha256": "f4be562bec4526803351a99f0cdc75a1fa090b4b5c24d78557a4d14828e4c4c9" } }, - "default_dataset": "microcosm_uk_2024_25", - "default_dataset_uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", + "default_dataset": "enhanced_frs_2024_25", + "default_dataset_uri": "hf://policyengine/policyengine-uk-data-private/enhanced_frs_2024_25.h5@1.58.2", "model_package": { "name": "policyengine-uk", - "sha256": "cc54025f2a3bc54be4f8d024d1e6f11ed29fed75ca513b214f2d2963c5bf4354", - "version": "2.132.6", - "wheel_url": "https://files.pythonhosted.org/packages/11/f2/c003cd7a95cb499737a5b8af0d619ba4e759c8bc7e55a2bb5c7efa46abd1/policyengine_uk-2.132.6-py3-none-any.whl" + "sha256": "f79df131dbd58c2e3935f7405e92d5ceb310a3a7021f173800a8f08f509439ac", + "version": "2.153.4", + "wheel_url": "https://files.pythonhosted.org/packages/2d/3b/e9ac957f2ca0ec2a00efcf7bd59704b4b7ef6ab532fa087df6d32e69a034/policyengine_uk-2.153.4-py3-none-any.whl" }, "policyengine_version": "6.10.2", "region_datasets": { - "constituency": { - "path_template": "microcosm_uk_2024_25_dense.h5" - }, - "local_authority": { - "path_template": "microcosm_uk_2024_25_dense.h5" - }, "national": { - "path_template": "microcosm_uk_2024_25.h5" + "path_template": "enhanced_frs_2024_25.h5" } }, - "regional_release_kind": "local_area", - "regional_release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-dense-20261019T000432Z-ee5c2dbe/releases/microcosm-uk-2024-25-dense/release_manifest.json", - "regional_source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-dense-20261019T000432Z-ee5c2dbe/releases/microcosm-uk-2024-25-dense/release_manifest.json", - "release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71/releases/microcosm-uk-2024-25-national/release_manifest.json", + "release_manifest_uri": "https://huggingface.co/policyengine/policyengine-uk-data-private/resolve/a14737cd9499e1059cbec579ddf9aec3b3667ed1/releases/1.58.2/release_manifest.json", "schema_version": 1, - "source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71/releases/microcosm-uk-2024-25-national/release_manifest.json", - "version": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71" + "source_manifest_uri": "hf://model/policyengine/policyengine-uk-data-private@a14737cd9499e1059cbec579ddf9aec3b3667ed1/releases/1.58.2/release_manifest.json", + "version": "policyengine-uk-data-1.58.2" }, "us": { "build_id": "populace-us-2024-spm-20260915", @@ -268,22 +251,6 @@ "revision": "655dd07e4bb9c777b00dac044949611f1feb824f", "sha256": "584ae33d80ca0431254610a3f8254d132da73477d31966d6446282861ecae50d" }, - "enhanced_frs_2024_25": { - "data_package_name": "policyengine-uk-data", - "path": "enhanced_frs_2024_25.h5", - "repo_id": "policyengine/policyengine-uk-data-private", - "repo_type": "model", - "revision": "1.58.1", - "sha256": "056e80fd8e9151d78f432a25cde863340baee81304c6216a37fb575ce8563784" - }, - "enhanced_frs_2024_25_tiny": { - "data_package_name": "policyengine-uk-data", - "path": "enhanced_frs_2024_25_tiny.h5", - "repo_id": "policyengine/policyengine-uk-data-private", - "repo_type": "model", - "revision": "1.58.1", - "sha256": "d5d2bde80f1f028fec98391ea31bb5a0cf8449e3867fc3c1bfe23693b9faecf8" - }, "frs_2023_24": { "data_package_name": "policyengine-uk-data", "path": "frs_2023_24.h5", @@ -292,22 +259,6 @@ "revision": "655dd07e4bb9c777b00dac044949611f1feb824f", "sha256": "df26d4d7af9d164aa2d064181b39290292d2f62bb26fee6126fc095fc06da292" }, - "frs_2024_25": { - "data_package_name": "policyengine-uk-data", - "path": "frs_2024_25.h5", - "repo_id": "policyengine/policyengine-uk-data-private", - "repo_type": "model", - "revision": "1.58.1", - "sha256": "97af00b2cd2739957f40dcc4de8e0383a6a91d47952c90d4b4921a6007bd2021" - }, - "frs_2024_25_tiny": { - "data_package_name": "policyengine-uk-data", - "path": "frs_2024_25_tiny.h5", - "repo_id": "policyengine/policyengine-uk-data-private", - "repo_type": "model", - "revision": "1.58.1", - "sha256": "e4d7662cd3f053620224b7ceff17266783f09407002a72633b043b844cec3f5a" - }, "populace_uk_2023": { "data_package_name": "populace-data", "path": "populace_uk_2023.h5", @@ -363,10 +314,10 @@ "policyengine-uk": { "country": "uk", "import_name": "policyengine_uk", - "install_requirement": "policyengine-uk==2.132.6", + "install_requirement": "policyengine-uk==2.153.4", "name": "policyengine-uk", "role": "country_model", - "version": "2.132.6" + "version": "2.153.4" }, "policyengine-us": { "country": "us", diff --git a/src/policyengine/data/bundle/uk.trace.tro.jsonld b/src/policyengine/data/bundle/uk.trace.tro.jsonld index fab107116..d7bcea609 100644 --- a/src/policyengine/data/bundle/uk.trace.tro.jsonld +++ b/src/policyengine/data/bundle/uk.trace.tro.jsonld @@ -17,7 +17,7 @@ "schema:name": "PolicyEngine", "schema:url": "https://policyengine.org" }, - "schema:dateCreated": "2026-10-19T10:17:15.545356+00:00", + "schema:dateCreated": "2026-10-15T15:19:27.080535Z", "schema:description": "TRACE TRO for certified runtime bundle uk-6.10.2 covering the bundle manifest, the certified dataset artifact, the country model wheel, and the country data release manifest when it is available.", "schema:name": "policyengine uk certified bundle TRO", "trov:createdWith": { @@ -45,7 +45,7 @@ "trov:hasArtifact": { "@id": "composition/1/artifact/data_release_manifest" }, - "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71/releases/microcosm-uk-2024-25-national/release_manifest.json" + "trov:hasLocation": "https://huggingface.co/policyengine/policyengine-uk-data-private/resolve/a14737cd9499e1059cbec579ddf9aec3b3667ed1/releases/1.58.2/release_manifest.json" }, { "@id": "arrangement/1/location/dataset", @@ -53,7 +53,7 @@ "trov:hasArtifact": { "@id": "composition/1/artifact/dataset" }, - "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71/microcosm_uk_2024_25.h5" + "trov:hasLocation": "https://huggingface.co/policyengine/policyengine-uk-data-private/resolve/1.58.2/enhanced_frs_2024_25.h5" }, { "@id": "arrangement/1/location/model_wheel", @@ -61,7 +61,7 @@ "trov:hasArtifact": { "@id": "composition/1/artifact/model_wheel" }, - "trov:hasLocation": "https://files.pythonhosted.org/packages/11/f2/c003cd7a95cb499737a5b8af0d619ba4e759c8bc7e55a2bb5c7efa46abd1/policyengine_uk-2.132.6-py3-none-any.whl" + "trov:hasLocation": "https://files.pythonhosted.org/packages/2d/3b/e9ac957f2ca0ec2a00efcf7bd59704b4b7ef6ab532fa087df6d32e69a034/policyengine_uk-2.153.4-py3-none-any.whl" } ] } @@ -75,51 +75,54 @@ "@type": "trov:ResearchArtifact", "schema:name": "policyengine.py bundle manifest for uk", "trov:mimeType": "application/json", - "trov:sha256": "461fe51f720501eda986d09e35d779a96269aeff203d4cda17f611ee357b0a73" + "trov:sha256": "c1bfc66e29c62e3ab75d8502978abab339f36d84ff708188c42c630116183486" }, { "@id": "composition/1/artifact/data_release_manifest", "@type": "trov:ResearchArtifact", - "schema:name": "microcosm-data release manifest 0.1.0", + "schema:name": "policyengine-uk-data release manifest 1.58.2", "trov:mimeType": "application/json", - "trov:sha256": "49f9fa820db2e6544ff5cdceeb2d868a504843a6a1c1c06b37188621e700066f" + "trov:sha256": "6867e8a7bd8be6110816527191b2348f712c4ba2502886696142506bb59fbbff" }, { "@id": "composition/1/artifact/dataset", "@type": "trov:ResearchArtifact", - "schema:name": "microcosm_uk_2024_25", + "schema:name": "enhanced_frs_2024_25", "trov:mimeType": "application/x-hdf5", - "trov:sha256": "810ba980005a8b907cb51464279fa5e0125464b7af9a4871b7f6744c30951ece" + "trov:sha256": "40804ba2540458cb6f3c476d29d3bb4bc88d9ac6b401fa285ed6e4232a55aa52" }, { "@id": "composition/1/artifact/model_wheel", "@type": "trov:ResearchArtifact", - "schema:name": "policyengine-uk==2.132.6 wheel", + "schema:name": "policyengine-uk==2.153.4 wheel", "trov:mimeType": "application/zip", - "trov:sha256": "cc54025f2a3bc54be4f8d024d1e6f11ed29fed75ca513b214f2d2963c5bf4354" + "trov:sha256": "f79df131dbd58c2e3935f7405e92d5ceb310a3a7021f173800a8f08f509439ac" } ], "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "7c61c3dea07f55a57db469c8f14affcd23fb44d4c4bb7b87eee7c6f9ef7dce4c" + "trov:sha256": "83f7b66ff6c378f3c8b6a53c945b33a0ac066cc2bad1bc7e5fa2d11b888f390f" } }, "trov:hasPerformance": { "@id": "trp/1", "@type": "trov:TransparentResearchPerformance", - "pe:builtWithModelVersion": "2.132.6", + "pe:builtWithModelGitSha": "a43e8c5196c7e7c09b6ecb4924f034444dd83b8f", + "pe:builtWithModelVersion": "2.122.2", "pe:certifiedBy": "policyengine.py bundle certification", - "pe:certifiedForModelVersion": "2.132.6", - "pe:compatibilityBasis": "built_with_model_package", - "pe:coreBinding": "bundle_pin", - "pe:dataBuildId": "microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71", + "pe:certifiedForCoreVersion": "3.33.3", + "pe:certifiedForModelVersion": "2.153.4", + "pe:compatibilityBasis": "qualified_exact_pair", + "pe:coreBinding": "certified", + "pe:dataBuildFingerprint": "sha256:c094d7006fdd81df220090284212f16bbffb15624643bc442c4bb3e1b1e5dac8", + "pe:dataBuildId": "policyengine-uk-data-1.58.2", "pe:emittedIn": "repository-bundle", - "rdfs:comment": "Certification of build microcosm-uk-2024-25-national-20261019T083323Z-6cba5d71 for policyengine-uk 2.132.6.", + "rdfs:comment": "Certification of build policyengine-uk-data-1.58.2 for policyengine-uk 2.153.4.", "trov:accessedArrangement": { "@id": "arrangement/1" }, - "trov:startedAtTime": "2026-10-19T10:17:15.545356+00:00", + "trov:startedAtTime": "2026-10-15T15:19:27.080535Z", "trov:wasConductedBy": { "@id": "trs" } diff --git a/src/policyengine/data/bundle/us.trace.tro.jsonld b/src/policyengine/data/bundle/us.trace.tro.jsonld index 2e9d5a6c7..f6d20b6ca 100644 --- a/src/policyengine/data/bundle/us.trace.tro.jsonld +++ b/src/policyengine/data/bundle/us.trace.tro.jsonld @@ -74,7 +74,7 @@ "@type": "trov:ResearchArtifact", "schema:name": "policyengine.py bundle manifest for us", "trov:mimeType": "application/json", - "trov:sha256": "461fe51f720501eda986d09e35d779a96269aeff203d4cda17f611ee357b0a73" + "trov:sha256": "c1bfc66e29c62e3ab75d8502978abab339f36d84ff708188c42c630116183486" }, { "@id": "composition/1/artifact/data_release_manifest", @@ -101,7 +101,7 @@ "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "80646bd11604743ae8f2fa2dd5be66e68bacaf42e4e9397cd1376a05b8ba5aef" + "trov:sha256": "441c51ba4d90475f064db1e57ea88c37e9d3c5fe89bf4a432878d9001e10d890" } }, "trov:hasPerformance": { diff --git a/tests/fixtures/household_calculator_snapshots/uk_couple_two_kids.json b/tests/fixtures/household_calculator_snapshots/uk_couple_two_kids.json index 28fa19e29..2d5394702 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_couple_two_kids.json +++ b/tests/fixtures/household_calculator_snapshots/uk_couple_two_kids.json @@ -13,14 +13,14 @@ "household.equiv_hbai_household_net_income": 52510.29, "household.fuel_duty": 0.0, "household.hbai_household_net_income": 73514.4, - "household.household_benefits": 9441.78, + "household.household_benefits": 9872.8, "household.household_count_people": 4.0, - "household.household_gross_income": 99441.78, + "household.household_gross_income": 99872.8, "household.household_id": 0.0, "household.household_income_decile": 10.0, "household.household_market_income": 90000.0, - "household.household_net_income": 80438.73, - "household.household_tax": 19003.05, + "household.household_net_income": 80869.8, + "household.household_tax": 19003.0, "household.household_wealth_decile": 10.0, "household.household_weight": 1.0, "household.in_poverty_ahc": 0.0, diff --git a/tests/fixtures/household_calculator_snapshots/uk_model_surface.json b/tests/fixtures/household_calculator_snapshots/uk_model_surface.json index 25270d576..159825bc9 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_model_surface.json +++ b/tests/fixtures/household_calculator_snapshots/uk_model_surface.json @@ -1,11 +1,11 @@ { "country_id": "uk", - "data_package_name": "microcosm-data", + "data_package_name": "policyengine-uk-data", "has_employment_income": true, "has_income_tax": true, "has_region_registry": true, "model_package_name": "policyengine-uk", - "num_parameters_bucketed_100s": 32, - "num_variables_bucketed_100s": 11, + "num_parameters_bucketed_100s": 43, + "num_variables_bucketed_100s": 12, "region_registry_country": "uk" } diff --git a/tests/fixtures/household_calculator_snapshots/uk_single_adult_employment_income.json b/tests/fixtures/household_calculator_snapshots/uk_single_adult_employment_income.json index ab0db4990..a96a4e099 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_single_adult_employment_income.json +++ b/tests/fixtures/household_calculator_snapshots/uk_single_adult_employment_income.json @@ -19,8 +19,8 @@ "household.household_id": 0.0, "household.household_income_decile": 10.0, "household.household_market_income": 30000.0, - "household.household_net_income": 24939.55, - "household.household_tax": 5060.45, + "household.household_net_income": 24939.6, + "household.household_tax": 5060.4, "household.household_wealth_decile": 10.0, "household.household_weight": 1.0, "household.in_poverty_ahc": 0.0, diff --git a/tests/fixtures/household_calculator_snapshots/uk_single_adult_no_income.json b/tests/fixtures/household_calculator_snapshots/uk_single_adult_no_income.json index 391af4492..2dba151cd 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_single_adult_no_income.json +++ b/tests/fixtures/household_calculator_snapshots/uk_single_adult_no_income.json @@ -19,8 +19,8 @@ "household.household_id": 0.0, "household.household_income_decile": 10.0, "household.household_market_income": 0.0, - "household.household_net_income": 4918.75, - "household.household_tax": 180.04, + "household.household_net_income": 4918.8, + "household.household_tax": 180.0, "household.household_wealth_decile": 10.0, "household.household_weight": 1.0, "household.in_poverty_ahc": 1.0, diff --git a/tests/fixtures/household_calculator_snapshots/uk_single_parent_one_child.json b/tests/fixtures/household_calculator_snapshots/uk_single_parent_one_child.json index c0d339da5..3c4e5025a 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_single_parent_one_child.json +++ b/tests/fixtures/household_calculator_snapshots/uk_single_parent_one_child.json @@ -19,8 +19,8 @@ "household.household_id": 0.0, "household.household_income_decile": 10.0, "household.household_market_income": 25000.0, - "household.household_net_income": 24342.45, - "household.household_tax": 3660.45, + "household.household_net_income": 24342.5, + "household.household_tax": 3660.4, "household.household_wealth_decile": 10.0, "household.household_weight": 1.0, "household.in_poverty_ahc": 0.0, diff --git a/uv.lock b/uv.lock index c35f23d0f..261c1e3d1 100644 --- a/uv.lock +++ b/uv.lock @@ -1894,9 +1894,9 @@ requires-dist = [ { name = "policyengine-core", marker = "extra == 'models'", specifier = "==3.33.3" }, { name = "policyengine-core", marker = "extra == 'uk'", specifier = "==3.33.3" }, { name = "policyengine-core", marker = "extra == 'us'", specifier = "==3.33.3" }, - { name = "policyengine-uk", marker = "extra == 'dev'", specifier = "==2.132.6" }, - { name = "policyengine-uk", marker = "extra == 'models'", specifier = "==2.132.6" }, - { name = "policyengine-uk", marker = "extra == 'uk'", specifier = "==2.132.6" }, + { name = "policyengine-uk", marker = "extra == 'dev'", specifier = "==2.153.4" }, + { name = "policyengine-uk", marker = "extra == 'models'", specifier = "==2.153.4" }, + { name = "policyengine-uk", marker = "extra == 'uk'", specifier = "==2.153.4" }, { name = "policyengine-us", marker = "extra == 'dev'", specifier = "==2.2.1" }, { name = "policyengine-us", marker = "extra == 'models'", specifier = "==2.2.1" }, { name = "policyengine-us", marker = "extra == 'us'", specifier = "==2.2.1" }, @@ -1946,7 +1946,7 @@ wheels = [ [[package]] name = "policyengine-uk" -version = "2.132.6" +version = "2.153.4" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "microdf-python" }, @@ -1954,9 +1954,9 @@ dependencies = [ { name = "pydantic" }, { name = "tables" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/3f/88/bc06328a739b335d4ef5f2d07fd36cc6a3a5e0f6ec1b2c774a14e77e43a3/policyengine_uk-2.132.6.tar.gz", hash = "sha256:f9ce261d9881eee32fab96341c7080cd0c86717b40785b5cdaff44b07262a771", size = 2560464, upload-time = "2026-10-15T10:08:14.263Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/2c/56b57f89d9f877333faa8b544e8de29d5d86a9dd607a4ecdebacfd8b091b/policyengine_uk-2.153.4.tar.gz", hash = "sha256:71214134602b722cc50698b0e03b156d23dcc83b309c202f9a86c6f6177c89e4", size = 3407695, upload-time = "2026-10-24T16:52:29.493Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/11/f2/c003cd7a95cb499737a5b8af0d619ba4e759c8bc7e55a2bb5c7efa46abd1/policyengine_uk-2.132.6-py3-none-any.whl", hash = "sha256:cc54025f2a3bc54be4f8d024d1e6f11ed29fed75ca513b214f2d2963c5bf4354", size = 3882707, upload-time = "2026-10-15T10:08:11.572Z" }, + { url = "https://files.pythonhosted.org/packages/2d/3b/e9ac957f2ca0ec2a00efcf7bd59704b4b7ef6ab532fa087df6d32e69a034/policyengine_uk-2.153.4-py3-none-any.whl", hash = "sha256:f79df131dbd58c2e3935f7405e92d5ceb310a3a7021f173800a8f08f509439ac", size = 5000353, upload-time = "2026-10-24T16:52:26.416Z" }, ] [[package]]