Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6fbeec3
Fix and add retirement contribution calibration targets
PavelMakarchuk Feb 25, 2026
a3a518d
Fix RETCB_VAL allocation to use proportional split
PavelMakarchuk Feb 25, 2026
ccb42ff
Add Roth calibration targets and fix traditional 401(k) target
PavelMakarchuk Feb 25, 2026
4c9fa45
Reconcile SS sub-components after PUF imputation
MaxGhenis Feb 23, 2026
646e5d7
Use age heuristic for new SS recipients in reconciliation
MaxGhenis Feb 23, 2026
5d7e508
Use QRF to predict SS sub-component split for new recipients
MaxGhenis Feb 23, 2026
27120a0
Use QRF for all PUF SS records, not just new recipients
MaxGhenis Feb 23, 2026
d3b1fe0
Add towncrier changelog fragment
MaxGhenis Feb 25, 2026
3bd8db4
Drop formula variables from dataset, add integrity tests
MaxGhenis Feb 26, 2026
6e261a5
Format test file with black
MaxGhenis Feb 26, 2026
ec4dec4
Fix black formatting for CI (26.1.0)
MaxGhenis Feb 26, 2026
f20cd32
fixup! Fix black formatting for CI (26.1.0)
MaxGhenis Feb 26, 2026
35fde91
Also drop adds/subtracts variables from dataset
MaxGhenis Feb 26, 2026
a8a0241
Train QRF for retirement contributions on PUF clone half
PavelMakarchuk Feb 26, 2026
d8e94a3
Expand retirement QRF predictors and add validation script
PavelMakarchuk Feb 26, 2026
2a9ab2c
Add QRF failure safety net and edge-case tests
PavelMakarchuk Feb 28, 2026
01f516f
Fix conftest mocking microimpute when it is installed
PavelMakarchuk Mar 2, 2026
da1289a
Address PR review: consolidate limits, improve logging, de-duplicate
PavelMakarchuk Mar 4, 2026
2dbbd20
Cap SE pension and fix IRA gate for dual-income / SE-only filers
PavelMakarchuk Mar 4, 2026
a1446c4
Rebase on main: use shared get_retirement_limits() from PR #566
PavelMakarchuk Mar 4, 2026
9551659
Update uv.lock for version freshness
PavelMakarchuk Mar 4, 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/changed/553.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix and add retirement contribution calibration targets: correct traditional IRA from $25B to $13.2B (SOI 1304), split 401(k) into traditional $482.7B and Roth $85.2B (BEA/FRED × Vanguard share), add Roth IRA at $35.0B (SOI Tables 5 & 6), add self-employed pension ALD at $29.5B (SOI 1304).
1 change: 1 addition & 0 deletions changelog.d/fix-ss-subcomponent-reconciliation.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reconcile SS sub-components after PUF imputation so they sum to social_security.
19 changes: 19 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
"""Root conftest: mock optional dependencies before collection.

microimpute requires Python >= 3.12, so mock it for test
environments running an older interpreter. Only install the
mock when the real package is unavailable — otherwise tests
that trigger CPS generation (which uses QRF imputation) would
silently get a MagicMock instead of the real model.
"""

import sys
from unittest.mock import MagicMock

try:
import microimpute # noqa: F401
except ImportError:
_mock = MagicMock()
sys.modules["microimpute"] = _mock
sys.modules["microimpute.models"] = _mock
sys.modules["microimpute.models.qrf"] = _mock
Loading