Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/pr_code_changes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,11 @@ jobs:
permissions:
contents: read
# Observed 2026-10-14..15: 28 to 54 minutes per Python version, with runs on
# 3.12 and 3.13 cancelled at the old 60-minute limit. Fail a hung job instead
# 3.12 and 3.13 cancelled at the old 60-minute limit. 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: 90
timeout-minutes: 150
strategy:
fail-fast: false
matrix:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ jobs:
contents: read
# Successful runs on main 2026-10-14..16: 3.11 33-54 min, 3.12 32-56,
# 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). Matches
# the pull-request Test job (#631).
timeout-minutes: 90
# cancelled before Versioning, so nothing was released (#640). With the UK
# pin on policyengine-uk 2.164.2 and 2.165.1, pull-request runs took 59 to
# over 90 minutes (#731). Matches the pull-request Test job (#631).
timeout-minutes: 150
strategy:
fail-fast: false
matrix:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Certify Microcosm UK for policyengine-uk 2.165.1: the national `microcosm-uk-2024-25-national-20261102T103421Z-f6e33b93` (`microcosm_uk_2024_25`), built with 2.165.1 from PolicyEngine/microcosm#1428 at `329a99e71` (with PolicyEngine/microcosm#1422 and PolicyEngine/microcosm#1430 merged), and the local-area cut `microcosm-uk-2024-25-dense-20261027T154955Z-6528c865` (`microcosm_uk_2024_25_dense`), which constituency and local-authority regions route to. The local-area cut was built from the head of PolicyEngine/policyengine-uk#2695 and records 2.162.12, so it is routed on an accepted model mismatch with an audited input surface: no dropped column, and fourteen inputs added after 2.162.12 take their defaults (the cash and stocks-and-shares ISA balances and subscriptions, Housing Benefit's permitted-work disregard, and the nine company car inputs, so local-area results carry no company cars). The UK model pin moves from 2.151.0 to 2.165.1.
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
]

Expand Down
4,466 changes: 4,429 additions & 37 deletions src/policyengine/data/bundle/manifest.json

Large diffs are not rendered by default.

4,424 changes: 4,409 additions & 15 deletions src/policyengine/data/bundle/uk.trace.tro.jsonld

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/policyengine/data/bundle/us.trace.tro.jsonld
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@type": "trov:ResearchArtifact",
"schema:name": "policyengine.py bundle manifest for us",
"trov:mimeType": "application/json",
"trov:sha256": "5d022a8fdc1b2cd118103d7dcd1a3da6fb634f4277b23cb1359d878af9081581"
"trov:sha256": "90f57a7025fdabd78caca873a8bff7674b6184016f51312709f85adc48d16ffd"
},
{
"@id": "composition/1/artifact/data_release_manifest",
Expand All @@ -101,7 +101,7 @@
"trov:hasFingerprint": {
"@id": "composition/1/fingerprint",
"@type": "trov:CompositionFingerprint",
"trov:sha256": "d8bbea22bdad9bd37cf2ffe7a604d5ab12b85794ea2b7b411344c24e7e9181e4"
"trov:sha256": "33b1fbf4a294bda1007234dae8f76bc65e10b0453a1b8a64bb54e3927249178f"
}
},
"trov:hasPerformance": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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-20261102T103421Z-f6e33b93"
)

def test_has_hundreds_of_parameters(self):
Expand Down
10 changes: 5 additions & 5 deletions tests/test_release_manifests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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-20261102T103421Z-f6e33b93"
UK_DATA_RELEASE_REVISION = "microcosm-uk-2024-25-national-20261102T103421Z-f6e33b93"
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-20261027T154955Z-6528c865"
# The prior certified default (policyengine-uk-data 1.58.1), kept resolvable
# via dataset_overlays.
UK_EFRS_DATASET_URI = (
Expand Down
4 changes: 2 additions & 2 deletions tests/test_uk_regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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-20261102T103421Z-f6e33b93"
)
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-20261027T154955Z-6528c865"
)
UK_AREA_REGION_COUNT = 650 + 361

Expand Down
12 changes: 6 additions & 6 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading