Skip to content
Merged
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
1 change: 1 addition & 0 deletions changelog.d/update-policyengine-us-1687.changed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump the bundled US model pin to policyengine-us 1.687.0.
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ uk = [
]
us = [
"policyengine_core>=3.25.0",
"policyengine-us==1.667.1",
"policyengine-us==1.687.0",
]
dev = [
"pytest",
Expand All @@ -61,7 +61,7 @@ dev = [
"ruff>=0.9.0",
"policyengine_core>=3.25.0",
"policyengine-uk==2.88.0",
"policyengine-us==1.667.1",
"policyengine-us==1.687.0",
"towncrier>=24.8.0",
"mypy>=1.11.0",
"pytest-cov>=5.0.0",
Expand Down
8 changes: 4 additions & 4 deletions src/policyengine/data/release_manifests/us.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"policyengine_version": "4.3.1",
"model_package": {
"name": "policyengine-us",
"version": "1.667.1",
"sha256": "e05f846473314ea37179b1cdebe0497fa550a4197414317d9858c822c1f9672c",
"wheel_url": "https://files.pythonhosted.org/packages/26/bc/ed46f19002c14e541e7b0b107cb47a47a5b24b45dad64bfc60405effb814/policyengine_us-1.667.1-py3-none-any.whl"
"version": "1.687.0",
"sha256": "cac7da3aa9ba4bf57009eee75d798217bbef7e1c5ca17646d472fad715ab634f",
"wheel_url": "https://files.pythonhosted.org/packages/c3/36/5633f5a3996c915494154ec3852011b1a239ea06d9f08cb6287ab709618c/policyengine_us-1.687.0-py3-none-any.whl"
},
"data_package": {
"name": "policyengine-us-data",
Expand All @@ -28,7 +28,7 @@
"compatibility_basis": "matching_data_build_fingerprint",
"data_build_id": "policyengine-us-data-1.78.2",
"built_with_model_version": "1.647.0",
"certified_for_model_version": "1.667.1",
"certified_for_model_version": "1.687.0",
"certified_by": "policyengine.py bundled manifest"
},
"default_dataset": "enhanced_cps_2024",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"family.family_id": 0.0,
"family.family_weight": 0.0,
"household.congressional_district_geoid": 0.0,
"household.household_benefits": 0.0,
"household.household_benefits": 1130.96,
"household.household_count_people": 4.0,
"household.household_id": 0.0,
"household.household_income_decile": 10.0,
"household.household_market_income": 240000.0,
"household.household_net_income": 175089.92,
"household.household_net_income": 176220.89,
"household.household_tax": 64910.07,
"household.household_weight": 1.0,
"marital_unit.marital_unit_id": 0.0,
Expand Down Expand Up @@ -84,7 +84,7 @@
"spm_unit.spm_unit_id": 0.0,
"spm_unit.spm_unit_is_in_deep_spm_poverty": 0.0,
"spm_unit.spm_unit_is_in_spm_poverty": 0.0,
"spm_unit.spm_unit_net_income": 175089.92,
"spm_unit.spm_unit_net_income": 148019.31,
"spm_unit.spm_unit_weight": 1.0,
"spm_unit.tanf": 0.0,
"tax_unit.ctc": 4400.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-us",
"num_parameters_bucketed_100s": 783,
"num_variables_bucketed_100s": 47,
"num_parameters_bucketed_100s": 850,
"num_variables_bucketed_100s": 48,
"region_registry_country": "us"
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"spm_unit.spm_unit_id": 0.0,
"spm_unit.spm_unit_is_in_deep_spm_poverty": 0.0,
"spm_unit.spm_unit_is_in_spm_poverty": 0.0,
"spm_unit.spm_unit_net_income": 48007.14,
"spm_unit.spm_unit_net_income": 42031.14,
"spm_unit.spm_unit_weight": 1.0,
"spm_unit.tanf": 0.0,
"tax_unit.ctc": 0.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"family.family_id": 0.0,
"family.family_weight": 0.0,
"household.congressional_district_geoid": 0.0,
"household.household_benefits": 1003.27,
"household.household_benefits": 1130.96,
"household.household_count_people": 2.0,
"household.household_id": 0.0,
"household.household_income_decile": 10.0,
"household.household_market_income": 40000.0,
"household.household_net_income": 39890.89,
"household.household_net_income": 40018.58,
"household.household_tax": 1112.38,
"household.household_weight": 1.0,
"marital_unit.marital_unit_id": 0.0,
Expand Down Expand Up @@ -50,7 +50,7 @@
"spm_unit.spm_unit_id": 0.0,
"spm_unit.spm_unit_is_in_deep_spm_poverty": 0.0,
"spm_unit.spm_unit_is_in_spm_poverty": 0.0,
"spm_unit.spm_unit_net_income": 39890.89,
"spm_unit.spm_unit_net_income": 37590.66,
"spm_unit.spm_unit_weight": 1.0,
"spm_unit.tanf": 0.0,
"tax_unit.ctc": 2200.0,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_extra_variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def test__us_extra_variables_appear_on_output_dataset(tmp_path) -> None:
tax_benefit_model_version=pe.us.model,
# Issue #303 used ``net_worth`` (imputed from SCF in later
# policyengine-us releases). Substituted with two variables
# present in the pinned 1.653.3 wheel so the test is
# present in the pinned US wheel so the test is
# hermetic: ``household_market_income`` is already a default
# (so we also cover the dedup path) and
# ``adjusted_gross_income`` is a tax_unit variable not in
Expand Down
2 changes: 1 addition & 1 deletion tests/test_models.py
Original file line number Diff line number Diff line change
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.667.1"
assert us_latest.model_package.version == "1.687.0"
assert us_latest.data_package.name == "policyengine-us-data"
assert us_latest.data_package.version == "1.78.2"
assert (
Expand Down
6 changes: 3 additions & 3 deletions tests/test_release_manifests.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test__given_us_manifest__then_has_pinned_model_and_data_packages(self):
assert manifest.country_id == "us"
assert manifest.policyengine_version == POLICYENGINE_VERSION
assert manifest.model_package.name == "policyengine-us"
assert manifest.model_package.version == "1.667.1"
assert manifest.model_package.version == "1.687.0"
assert manifest.data_package.name == "policyengine-us-data"
assert manifest.data_package.version == "1.78.2"
assert manifest.data_package.repo_id == "policyengine/policyengine-us-data"
Expand All @@ -70,7 +70,7 @@ def test__given_us_manifest__then_has_pinned_model_and_data_packages(self):
assert manifest.certification is not None
assert manifest.certification.data_build_id == "policyengine-us-data-1.78.2"
assert manifest.certification.built_with_model_version == "1.647.0"
assert manifest.certification.certified_for_model_version == "1.667.1"
assert manifest.certification.certified_for_model_version == "1.687.0"

def test__given_uk_manifest__then_has_pinned_model_and_data_packages(self):
manifest = get_release_manifest("uk")
Expand Down Expand Up @@ -311,7 +311,7 @@ def test__given_private_manifest_unavailable__then_bundled_certification_is_used
):
certification = certify_data_release_compatibility(
"us",
runtime_model_version="1.667.1",
runtime_model_version="1.687.0",
)

assert certification == get_release_manifest("us").certification
Expand Down
16 changes: 8 additions & 8 deletions uv.lock

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

Loading