Skip to content

Bump pinned country-model versions to 3.9-compatible releases #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MaxGhenis wants to merge 5 commits into from
Closed

Bump pinned country-model versions to 3.9-compatible releases #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28fb1ed
Bump pinned country-model versions to 3.9-compatible releases
MaxGhenis Apr 17, 2026
e682826
Retrigger CI for policyengine-us 1.647.0
MaxGhenis Apr 17, 2026
35b1819
Bump bundled release manifests to match new country-model pins
MaxGhenis Apr 17, 2026
23007a0
Update manifest version assertions to match bumped pins
MaxGhenis Apr 17, 2026
6772ecc
Revert accidental bundle_id/policyengine_version bumps in manifests
MaxGhenis Apr 17, 2026
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
1 change: 1 addition & 0 deletions changelog.d/bump-country-pins.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump pinned country-model versions in `[us]`, `[uk]`, and `[dev]` extras, and the corresponding bundled release manifests, to versions that support Python 3.9, include the breakdown-range fixes required by the stricter validator in policyengine-core 3.24.0+, and ship with policyengine-core>=3.24.1. Previously `policyengine-us==1.602.0` and `policyengine-uk==2.74.0` were stale pins that no longer installed cleanly under modern core. Data-package pins (`policyengine-us-data==1.73.0`, `policyengine-uk-data==1.40.4`) are unchanged — the bumped model versions read the same dataset artefacts as before.
14 changes: 7 additions & 7 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ dependencies = [

[project.optional-dependencies]
uk = [
"policyengine_core>=3.23.6",
"policyengine-uk==2.74.0",
"policyengine_core>=3.24.1",
"policyengine-uk==2.88.0",
]
us = [
"policyengine_core>=3.23.6",
"policyengine-us==1.602.0",
"policyengine_core>=3.24.1",
"policyengine-us==1.647.0",
]
dev = [
"pytest",
Expand All @@ -48,9 +48,9 @@ dev = [
"build",
"pytest-asyncio>=0.26.0",
"ruff>=0.9.0",
"policyengine_core>=3.23.6",
"policyengine-uk==2.74.0",
"policyengine-us==1.602.0",
"policyengine_core>=3.24.1",
"policyengine-uk==2.88.0",
"policyengine-us==1.647.0",
"towncrier>=24.8.0",
"mypy>=1.11.0",
"pytest-cov>=5.0.0",
Expand Down
6 changes: 3 additions & 3 deletions src/policyengine/data/release_manifests/uk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"policyengine_version": "3.4.0",
"model_package": {
"name": "policyengine-uk",
"version": "2.74.0"
"version": "2.88.0"
},
"data_package": {
"name": "policyengine-uk-data",
Expand All @@ -24,8 +24,8 @@
"certification": {
"compatibility_basis": "exact_build_model_version",
"data_build_id": "policyengine-uk-data-1.40.4",
"built_with_model_version": "2.74.0",
"certified_for_model_version": "2.74.0",
"built_with_model_version": "2.88.0",
"certified_for_model_version": "2.88.0",
"certified_by": "policyengine.py bundled manifest"
},
"default_dataset": "enhanced_frs_2023_24",
Expand Down
6 changes: 3 additions & 3 deletions src/policyengine/data/release_manifests/us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"policyengine_version": "3.4.0",
"model_package": {
"name": "policyengine-us",
"version": "1.602.0"
"version": "1.647.0"
},
"data_package": {
"name": "policyengine-us-data",
Expand All @@ -24,8 +24,8 @@
"certification": {
"compatibility_basis": "exact_build_model_version",
"data_build_id": "policyengine-us-data-1.73.0",
"built_with_model_version": "1.602.0",
"certified_for_model_version": "1.602.0",
"built_with_model_version": "1.647.0",
"certified_for_model_version": "1.647.0",
"certified_by": "policyengine.py bundled manifest"
},
"default_dataset": "enhanced_cps_2024",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ 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.74.0"
assert uk_latest.model_package.version == "2.88.0"
assert uk_latest.data_package.name == "policyengine-uk-data"
assert uk_latest.data_package.version == "1.40.4"
assert (
Expand Down Expand Up @@ -113,7 +113,7 @@ def test_has_release_manifest_metadata(self):
assert us_latest.release_manifest is not None
assert us_latest.release_manifest.country_id == "us"
assert us_latest.model_package.name == "policyengine-us"
assert us_latest.model_package.version == "1.602.0"
assert us_latest.model_package.version == "1.647.0"
assert us_latest.data_package.name == "policyengine-us-data"
assert us_latest.data_package.version == "1.73.0"
assert (
Expand Down
12 changes: 6 additions & 6 deletions tests/test_release_manifests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test__given_us_manifest__then_has_pinned_model_and_data_packages(self):
assert manifest.country_id == "us"
assert manifest.policyengine_version == "3.4.0"
assert manifest.model_package.name == "policyengine-us"
assert manifest.model_package.version == "1.602.0"
assert manifest.model_package.version == "1.647.0"
assert manifest.data_package.name == "policyengine-us-data"
assert manifest.data_package.version == "1.73.0"
assert manifest.data_package.repo_id == "policyengine/policyengine-us-data"
Expand All @@ -60,8 +60,8 @@ def test__given_us_manifest__then_has_pinned_model_and_data_packages(self):
assert manifest.certified_data_artifact.dataset == "enhanced_cps_2024"
assert manifest.certification is not None
assert manifest.certification.data_build_id == "policyengine-us-data-1.73.0"
assert manifest.certification.built_with_model_version == "1.602.0"
assert manifest.certification.certified_for_model_version == "1.602.0"
assert manifest.certification.built_with_model_version == "1.647.0"
assert manifest.certification.certified_for_model_version == "1.647.0"

def test__given_uk_manifest__then_has_pinned_model_and_data_packages(self):
manifest = get_release_manifest("uk")
Expand All @@ -71,7 +71,7 @@ def test__given_uk_manifest__then_has_pinned_model_and_data_packages(self):
assert manifest.country_id == "uk"
assert manifest.policyengine_version == "3.4.0"
assert manifest.model_package.name == "policyengine-uk"
assert manifest.model_package.version == "2.74.0"
assert manifest.model_package.version == "2.88.0"
assert manifest.data_package.name == "policyengine-uk-data"
assert manifest.data_package.version == "1.40.4"
assert (
Expand All @@ -84,8 +84,8 @@ def test__given_uk_manifest__then_has_pinned_model_and_data_packages(self):
assert manifest.certified_data_artifact.dataset == "enhanced_frs_2023_24"
assert manifest.certification is not None
assert manifest.certification.data_build_id == "policyengine-uk-data-1.40.4"
assert manifest.certification.built_with_model_version == "2.74.0"
assert manifest.certification.certified_for_model_version == "2.74.0"
assert manifest.certification.built_with_model_version == "2.88.0"
assert manifest.certification.certified_for_model_version == "2.88.0"

def test__given_us_dataset_name__then_resolves_to_versioned_hf_url(self):
resolved = resolve_dataset_reference("us", "enhanced_cps_2024")
Expand Down
Loading