diff --git a/.github/workflows/pr_code_changes.yaml b/.github/workflows/pr_code_changes.yaml index e19e3869f..66dcbea93 100644 --- a/.github/workflows/pr_code_changes.yaml +++ b/.github/workflows/pr_code_changes.yaml @@ -177,9 +177,11 @@ jobs: # 3.12 and 3.13 cancelled at the old 60-minute limit. By early Nov, 65 to 90 # minutes on 3.11-3.13, where coverage.py 7.13.5 uses its C trace function # (sys.monitoring only on 3.14, which takes 47-60), and one of them was often - # cancelled at 90: 3.12 on #730, 3.11 on #735 (#736). Fail a hung job instead + # cancelled at 90: 3.12 on #730, 3.11 on #735 (#736). With the UK pin on + # policyengine-uk 2.164.2 and 2.165.1 (#731, 1-2 Nov), 59 to over 90 minutes, + # so runs on 3.11, 3.12 and 3.13 were cancelled at 90. Fail a hung job instead # of holding a shared org runner for the 6-hour default. - timeout-minutes: 105 + timeout-minutes: 150 strategy: fail-fast: false matrix: diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 4ed2b2945..e86ee6bd4 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -52,8 +52,9 @@ jobs: # 3.13 36-60, 3.14 23-42; at 60 minutes every push run on 16 Oct was # cancelled before Versioning, so nothing was released (#640). By early # Nov, pull-request runs on 3.11-3.13 took 65 to 90 minutes and were often - # cancelled at 90 (#736). Matches the pull-request Test job (#631). - timeout-minutes: 105 + # cancelled at 90 (#736); with the UK pin on policyengine-uk 2.164.2 and + # 2.165.1, 59 to over 90 minutes (#731). Matches the pull-request Test job (#631). + timeout-minutes: 150 strategy: fail-fast: false matrix: diff --git a/changelog.d/certify-uk-microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7.changed.md b/changelog.d/certify-uk-microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7.changed.md new file mode 100644 index 000000000..49f4812ff --- /dev/null +++ b/changelog.d/certify-uk-microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7.changed.md @@ -0,0 +1 @@ +Certify Microcosm UK for policyengine-uk 2.165.1: the national `microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7` (`microcosm_uk_2024_25`), built with 2.165.1 from PolicyEngine/microcosm#1491 at `dd99a1dcd`, and the local-area cut `microcosm-uk-2024-25-dense-20261104T093024Z-83802786` (`microcosm_uk_2024_25_dense`), which constituency and local-authority regions route to. The national binds HMRC's 2024-25 company car holders, taxable value and fuel counts, and bands SPI records on total income net of expenses. The local-area cut is built from the same commit and spine with its gate-only sign-off (`5293966d4`), also on 2.165.1, so both certify on their own build: area runs read every input the engine takes, company cars and ISA payments included. The UK model pin moves from 2.151.0 to 2.165.1. diff --git a/pyproject.toml b/pyproject.toml index dab8a0349..8720be5af 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.151.0", + "policyengine-uk==2.165.1", "spm-calculator==1.0.0", ] uk = [ "policyengine-core==3.33.3", - "policyengine-uk==2.151.0", + "policyengine-uk==2.165.1", ] 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.151.0", + "policyengine-uk==2.165.1", "spm-calculator==1.0.0", ] diff --git a/src/policyengine/data/bundle/manifest.json b/src/policyengine/data/bundle/manifest.json index ca0dbeab9..a1965c40d 100644 --- a/src/policyengine/data/bundle/manifest.json +++ b/src/policyengine/data/bundle/manifest.json @@ -16,31 +16,31 @@ }, "data_releases": { "uk": { - "build_id": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", + "build_id": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", "bundle_id": "uk-6.13.0", "certification": { - "built_with_model_version": "2.151.0", + "built_with_model_version": "2.165.1", "certified_by": "policyengine.py bundle certification", - "certified_for_model_version": "2.151.0", + "certified_for_model_version": "2.165.1", "compatibility_basis": "built_with_model_package", "core_binding": "bundle_pin", - "data_build_id": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504" + "data_build_id": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7" }, "certified_data_artifact": { - "build_id": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", + "build_id": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", "data_package": { "name": "microcosm-data", "version": "0.1.0" }, "dataset": "microcosm_uk_2024_25", - "sha256": "b96a8cd625b645a409c063b1de5158532708a2f0d3c3897a794a8fb0bbd5064e", - "uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261025T091414Z-a6299504" + "sha256": "b35b336242caef97892efdc475d35a55160ef22388f42ebf2a610b410dd60837", + "uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7" }, "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-20261025T091414Z-a6299504", + "release_manifest_revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", "repo_id": "policyengine/populace-uk-private", "repo_type": "dataset", "version": "0.1.0" @@ -50,66 +50,66 @@ "calibration_diagnostics": { "path": "releases/microcosm-uk-2024-25-national/calibration_diagnostics.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", - "sha256": "e61a60a1a8d57204be15600b2f98dbc864123589d48ede8414ebe43139d7c09b" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "851969f7398fef4a72c78ce81e3d5532944ee2359ec16cbc63cbe2c6d33b6341" }, "microcosm_uk_2024_25": { "path": "microcosm_uk_2024_25.h5", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", - "sha256": "b96a8cd625b645a409c063b1de5158532708a2f0d3c3897a794a8fb0bbd5064e" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "b35b336242caef97892efdc475d35a55160ef22388f42ebf2a610b410dd60837" }, "microcosm_uk_2024_25_calibration": { "path": "microcosm_uk_2024_25_calibration.npz", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", - "sha256": "96756884d719fa969c2fbdf548f4e56b8311c0c3765c66b1bf9bc8fe862f718f" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "7c2ec377c67c716463ea858e61556bd1dda5c899c269f2c9bc5f1ac15bf1983b" }, "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-20261026T105309Z-c9df4b86", - "sha256": "cb3712f25b76109ad27b7b0cdf5dee78c55d3b7f55ce7bf207ef1a191da2ae9a" + "revision": "microcosm-uk-2024-25-dense-20261104T093024Z-83802786", + "sha256": "51a370ffee1414a39ffe192f9031b5b4a7e8970ebd8cc98c4049ebceaea6a323" }, "release_certification": { "path": "releases/microcosm-uk-2024-25-national/release_certification.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", - "sha256": "fc657f7ec9a759d15d4ad683ab92d5324f37844667d9d54b6d0648108419cf59" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "d5a78e22bb23223ddc58444e894df5e76bbb5cbfea1c953ee9b6dcb4910e634c" }, "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-20261025T091414Z-a6299504", - "sha256": "54312402dc3152ab46208f89c86e5d8bf0dce13dfc723171f5a2c08a826217cd" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "26083c43c6da41318b584293bee0055d859cfe578a2ebad43aaf6441d126a718" }, "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-20261025T091414Z-a6299504", - "sha256": "9e80102acf02a09a70ba3f45d7e6da2d33178476840388d640105f36ee353bd2" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "59711c83849bb7b2d975484eca15f3669d33e59f9a2b2853ff01f97d429040f3" }, "spine_gates": { "path": "releases/microcosm-uk-2024-25-national/spine_gates.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", - "sha256": "6856e437f4fa12a07ffe346a8f070b56d9a05c8dbece3eb277c293e75a0e582b" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "40163889bbd38d005e1b4175d42265b6e4b2b2cc8d2278d1cd6ba51fc1d06905" }, "terminal_gates": { "path": "releases/microcosm-uk-2024-25-national/terminal_gates.json", "repo_id": "policyengine/populace-uk-private", - "revision": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", - "sha256": "cffa3db6734604c4fb7176bb81def41d313a8df26a2a2f675a970a6e9899a644" + "revision": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", + "sha256": "3150839a2c658402387ff94c5ca6baefaac81e8f196fc9d286d7f7af24a2b34c" } }, "default_dataset": "microcosm_uk_2024_25", - "default_dataset_uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261025T091414Z-a6299504", + "default_dataset_uri": "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5@microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", "model_package": { "name": "policyengine-uk", - "sha256": "5722f55aca3eb88e1a228e95e1a57e3bd70a4d530a5a000991565ebd8955ce35", - "version": "2.151.0", - "wheel_url": "https://files.pythonhosted.org/packages/42/15/610c6825ed934d4338a42707b8c021e5627738e68224b6672df94770295c/policyengine_uk-2.151.0-py3-none-any.whl" + "sha256": "e8327ffe22393d468f7c4bb0e1e18b8b8ed7241b1a5fcec447917196e8a1b4fa", + "version": "2.165.1", + "wheel_url": "https://files.pythonhosted.org/packages/eb/3c/4db973ea84deb97e32a4a67a832babbade2475f2df9edc7a2494dae86d69/policyengine_uk-2.165.1-py3-none-any.whl" }, "policyengine_version": "6.13.0", "region_datasets": { @@ -124,12 +124,13 @@ } }, "regional_release_kind": "local_area", - "regional_release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-dense-20261026T105309Z-c9df4b86/releases/microcosm-uk-2024-25-dense/release_manifest.json", - "regional_source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-dense-20261026T105309Z-c9df4b86/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-20261025T091414Z-a6299504/releases/microcosm-uk-2024-25-national/release_manifest.json", + "regional_release_manifest_uri": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-dense-20261104T093024Z-83802786/releases/microcosm-uk-2024-25-dense/release_manifest.json", + "regional_source_manifest_sha256": "cb56e4072b41bc757bcdc48acbe7840fa1262ab18bc600e89cf0f97ba8ec475a", + "regional_source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-dense-20261104T093024Z-83802786/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-20261103T154302Z-0639b9c7/releases/microcosm-uk-2024-25-national/release_manifest.json", "schema_version": 1, - "source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-national-20261025T091414Z-a6299504/releases/microcosm-uk-2024-25-national/release_manifest.json", - "version": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504" + "source_manifest_uri": "hf://dataset/policyengine/populace-uk-private@microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7/releases/microcosm-uk-2024-25-national/release_manifest.json", + "version": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7" }, "us": { "build_id": "populace-us-2024-spm-20260915", @@ -363,10 +364,10 @@ "policyengine-uk": { "country": "uk", "import_name": "policyengine_uk", - "install_requirement": "policyengine-uk==2.151.0", + "install_requirement": "policyengine-uk==2.165.1", "name": "policyengine-uk", "role": "country_model", - "version": "2.151.0" + "version": "2.165.1" }, "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 d45406a76..3c1b1ee08 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-25T10:57:31.393341+00:00", + "schema:dateCreated": "2026-11-03T17:07:52.460115+00:00", "schema:description": "TRACE TRO for certified runtime bundle uk-6.13.0 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-20261025T091414Z-a6299504/releases/microcosm-uk-2024-25-national/release_manifest.json" + "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7/releases/microcosm-uk-2024-25-national/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-20261025T091414Z-a6299504/microcosm_uk_2024_25.h5" + "trov:hasLocation": "https://huggingface.co/datasets/policyengine/populace-uk-private/resolve/microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7/microcosm_uk_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/42/15/610c6825ed934d4338a42707b8c021e5627738e68224b6672df94770295c/policyengine_uk-2.151.0-py3-none-any.whl" + "trov:hasLocation": "https://files.pythonhosted.org/packages/eb/3c/4db973ea84deb97e32a4a67a832babbade2475f2df9edc7a2494dae86d69/policyengine_uk-2.165.1-py3-none-any.whl" } ] } @@ -75,51 +75,51 @@ "@type": "trov:ResearchArtifact", "schema:name": "policyengine.py bundle manifest for uk", "trov:mimeType": "application/json", - "trov:sha256": "3ab1afa08ce750ca652e97d5cedf63e9c5209b4887ee1246b39b18831b635edb" + "trov:sha256": "2f1a76a1b191cf5f2a1c13672bf5d5a0abdd22a4a4ceb70a3ed5de87906ae790" }, { "@id": "composition/1/artifact/data_release_manifest", "@type": "trov:ResearchArtifact", "schema:name": "microcosm-data release manifest 0.1.0", "trov:mimeType": "application/json", - "trov:sha256": "1ebdbcc37535858c995e2d7434074f4ab89521e7b64f9b539a0684906f800e49" + "trov:sha256": "021330461f8bce485ac74c00198a621d9f38658044be0be2454e0c422bd48c0f" }, { "@id": "composition/1/artifact/dataset", "@type": "trov:ResearchArtifact", "schema:name": "microcosm_uk_2024_25", "trov:mimeType": "application/x-hdf5", - "trov:sha256": "b96a8cd625b645a409c063b1de5158532708a2f0d3c3897a794a8fb0bbd5064e" + "trov:sha256": "b35b336242caef97892efdc475d35a55160ef22388f42ebf2a610b410dd60837" }, { "@id": "composition/1/artifact/model_wheel", "@type": "trov:ResearchArtifact", - "schema:name": "policyengine-uk==2.151.0 wheel", + "schema:name": "policyengine-uk==2.165.1 wheel", "trov:mimeType": "application/zip", - "trov:sha256": "5722f55aca3eb88e1a228e95e1a57e3bd70a4d530a5a000991565ebd8955ce35" + "trov:sha256": "e8327ffe22393d468f7c4bb0e1e18b8b8ed7241b1a5fcec447917196e8a1b4fa" } ], "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "4fc21d8a1f65d80f3e97551c95218f13157911cdffc0ce2c00bb33345f37288d" + "trov:sha256": "d01daf2bac51eaf88da86f147942c079f113e18ebae51b187ad1c01820cf9c1c" } }, "trov:hasPerformance": { "@id": "trp/1", "@type": "trov:TransparentResearchPerformance", - "pe:builtWithModelVersion": "2.151.0", + "pe:builtWithModelVersion": "2.165.1", "pe:certifiedBy": "policyengine.py bundle certification", - "pe:certifiedForModelVersion": "2.151.0", + "pe:certifiedForModelVersion": "2.165.1", "pe:compatibilityBasis": "built_with_model_package", "pe:coreBinding": "bundle_pin", - "pe:dataBuildId": "microcosm-uk-2024-25-national-20261025T091414Z-a6299504", + "pe:dataBuildId": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", "pe:emittedIn": "repository-bundle", - "rdfs:comment": "Certification of build microcosm-uk-2024-25-national-20261025T091414Z-a6299504 for policyengine-uk 2.151.0.", + "rdfs:comment": "Certification of build microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7 for policyengine-uk 2.165.1.", "trov:accessedArrangement": { "@id": "arrangement/1" }, - "trov:startedAtTime": "2026-10-25T10:57:31.393341+00:00", + "trov:startedAtTime": "2026-11-03T17:07:52.460115+00:00", "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 9c4d56cb4..18ca3e819 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": "3ab1afa08ce750ca652e97d5cedf63e9c5209b4887ee1246b39b18831b635edb" + "trov:sha256": "2f1a76a1b191cf5f2a1c13672bf5d5a0abdd22a4a4ceb70a3ed5de87906ae790" }, { "@id": "composition/1/artifact/data_release_manifest", @@ -101,7 +101,7 @@ "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "8120db8d90cb38e4e2a27f26d1a5c1e6381f57809a43ad136f3987683a54a61a" + "trov:sha256": "92cc9fffc35ab3330758a3ac661ea7a5a61a452ce3926098eee990f61f02dc0c" } }, "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 2d5394702..967efd45e 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_couple_two_kids.json +++ b/tests/fixtures/household_calculator_snapshots/uk_couple_two_kids.json @@ -13,13 +13,13 @@ "household.equiv_hbai_household_net_income": 52510.29, "household.fuel_duty": 0.0, "household.hbai_household_net_income": 73514.4, - "household.household_benefits": 9872.8, + "household.household_benefits": 10743.0, "household.household_count_people": 4.0, - "household.household_gross_income": 99872.8, + "household.household_gross_income": 100743.0, "household.household_id": 0.0, "household.household_income_decile": 10.0, "household.household_market_income": 90000.0, - "household.household_net_income": 80869.8, + "household.household_net_income": 81740.0, "household.household_tax": 19003.0, "household.household_wealth_decile": 10.0, "household.household_weight": 1.0, diff --git a/tests/fixtures/household_calculator_snapshots/uk_model_surface.json b/tests/fixtures/household_calculator_snapshots/uk_model_surface.json index c926e1f2d..c62c5b249 100644 --- a/tests/fixtures/household_calculator_snapshots/uk_model_surface.json +++ b/tests/fixtures/household_calculator_snapshots/uk_model_surface.json @@ -5,7 +5,7 @@ "has_income_tax": true, "has_region_registry": true, "model_package_name": "policyengine-uk", - "num_parameters_bucketed_100s": 42, - "num_variables_bucketed_100s": 12, + "num_parameters_bucketed_100s": 46, + "num_variables_bucketed_100s": 13, "region_registry_country": "uk" } 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 2dba151cd..9e0e58a18 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 @@ -10,9 +10,9 @@ "benunit.universal_credit": 5098.8, "benunit.working_tax_credit": 0.0, "household.council_tax": 0.0, - "household.equiv_hbai_household_net_income": 7610.15, + "household.equiv_hbai_household_net_income": 7834.03, "household.fuel_duty": 0.0, - "household.hbai_household_net_income": 5098.8, + "household.hbai_household_net_income": 5248.8, "household.household_benefits": 5098.8, "household.household_count_people": 1.0, "household.household_gross_income": 5098.8, 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 3c4e5025a..adc16c6a0 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 @@ -10,9 +10,9 @@ "benunit.universal_credit": 1596.3, "benunit.working_tax_credit": 0.0, "household.council_tax": 0.0, - "household.equiv_hbai_household_net_income": 28186.78, + "household.equiv_hbai_household_net_income": 28359.19, "household.fuel_duty": 0.0, - "household.hbai_household_net_income": 24522.5, + "household.hbai_household_net_income": 24672.5, "household.household_benefits": 3002.9, "household.household_count_people": 2.0, "household.household_gross_income": 28002.9, diff --git a/tests/test_models.py b/tests/test_models.py index c057a5196..f93460363 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -43,13 +43,13 @@ def test_has_release_manifest_metadata(self): assert uk_latest.release_manifest is not None assert uk_latest.release_manifest.country_id == "uk" assert uk_latest.model_package.name == "policyengine-uk" - assert uk_latest.model_package.version == "2.151.0" + assert uk_latest.model_package.version == "2.165.1" assert uk_latest.data_package.name == "microcosm-data" assert uk_latest.data_package.version == "0.1.0" assert ( uk_latest.default_dataset_uri == "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5" - "@microcosm-uk-2024-25-national-20261025T091414Z-a6299504" + "@microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7" ) def test_has_hundreds_of_parameters(self): diff --git a/tests/test_release_manifests.py b/tests/test_release_manifests.py index d158ea034..c6392e00f 100644 --- a/tests/test_release_manifests.py +++ b/tests/test_release_manifests.py @@ -73,13 +73,13 @@ "hf://policyengine/populace-us/populace_us_2024_acs_local.h5" f"@{US_LOCAL_AREA_RELEASE_ID}" ) -UK_MODEL_VERSION = "2.151.0" -UK_BUILT_WITH_MODEL_VERSION = "2.151.0" +UK_MODEL_VERSION = "2.165.1" +UK_BUILT_WITH_MODEL_VERSION = "2.165.1" UK_DATA_RELEASE_VERSION = "0.1.0" -UK_DATA_RELEASE_ID = "microcosm-uk-2024-25-national-20261025T091414Z-a6299504" -UK_DATA_RELEASE_REVISION = "microcosm-uk-2024-25-national-20261025T091414Z-a6299504" +UK_DATA_RELEASE_ID = "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7" +UK_DATA_RELEASE_REVISION = "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7" UK_DATA_RELEASE_PATH = "releases/microcosm-uk-2024-25-national/release_manifest.json" -UK_LOCAL_AREA_RELEASE_ID = "microcosm-uk-2024-25-dense-20261026T105309Z-c9df4b86" +UK_LOCAL_AREA_RELEASE_ID = "microcosm-uk-2024-25-dense-20261104T093024Z-83802786" # The prior certified default (policyengine-uk-data 1.58.1), kept resolvable # via dataset_overlays. UK_EFRS_DATASET_URI = ( diff --git a/tests/test_uk_regions.py b/tests/test_uk_regions.py index f1e7e716e..6aafc93b6 100644 --- a/tests/test_uk_regions.py +++ b/tests/test_uk_regions.py @@ -24,11 +24,11 @@ # release its constituency and local-authority regions are routed to. UK_CERTIFIED_NATIONAL_URI = ( "hf://policyengine/populace-uk-private/microcosm_uk_2024_25.h5" - "@microcosm-uk-2024-25-national-20261025T091414Z-a6299504" + "@microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7" ) UK_CERTIFIED_LOCAL_AREA_URI = ( "hf://policyengine/populace-uk-private/microcosm_uk_2024_25_dense.h5" - "@microcosm-uk-2024-25-dense-20261026T105309Z-c9df4b86" + "@microcosm-uk-2024-25-dense-20261104T093024Z-83802786" ) UK_AREA_REGION_COUNT = 650 + 361 diff --git a/uv.lock b/uv.lock index 010a452f9..1c97e2111 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.151.0" }, - { name = "policyengine-uk", marker = "extra == 'models'", specifier = "==2.151.0" }, - { name = "policyengine-uk", marker = "extra == 'uk'", specifier = "==2.151.0" }, + { name = "policyengine-uk", marker = "extra == 'dev'", specifier = "==2.165.1" }, + { name = "policyengine-uk", marker = "extra == 'models'", specifier = "==2.165.1" }, + { name = "policyengine-uk", marker = "extra == 'uk'", specifier = "==2.165.1" }, { 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.151.0" +version = "2.165.1" 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/8f/b4/4a4ccbca68518d3e433d2d00c7e35fe136239a8ae2baf59324637a941f97/policyengine_uk-2.151.0.tar.gz", hash = "sha256:93bc378cad973244e7e3854d7a3a35e1011d381895d029b6996f14b32c240fd1", size = 3316516, upload-time = "2026-10-23T22:35:26.619Z" } +sdist = { url = "https://files.pythonhosted.org/packages/23/ce/df5ddeb39b25ab2b4d7ebfaa9109622cbcb000073fdcabd2f39a9503dc05/policyengine_uk-2.165.1.tar.gz", hash = "sha256:7b3620e0c3c3b612b36c4b8f37a802349e1c1332df6ece15329e12aa7a7ebc31", size = 3943824, upload-time = "2026-10-30T14:56:29.366Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/42/15/610c6825ed934d4338a42707b8c021e5627738e68224b6672df94770295c/policyengine_uk-2.151.0-py3-none-any.whl", hash = "sha256:5722f55aca3eb88e1a228e95e1a57e3bd70a4d530a5a000991565ebd8955ce35", size = 4896964, upload-time = "2026-10-23T22:35:24.116Z" }, + { url = "https://files.pythonhosted.org/packages/eb/3c/4db973ea84deb97e32a4a67a832babbade2475f2df9edc7a2494dae86d69/policyengine_uk-2.165.1-py3-none-any.whl", hash = "sha256:e8327ffe22393d468f7c4bb0e1e18b8b8ed7241b1a5fcec447917196e8a1b4fa", size = 5720638, upload-time = "2026-10-30T14:56:26.834Z" }, ] [[package]]