From 91830254d567cbe6cd49c7a917c7547a8255355c Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Sat, 1 Feb 2025 08:14:14 +1100 Subject: [PATCH 1/3] Reinstate larger runner for data deployment Fixes #150 --- .github/workflows/code_changes.yaml | 2 +- changelog_entry.yaml | 4 ++++ policyengine_us_data/datasets/cps/extended_cps.py | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code_changes.yaml b/.github/workflows/code_changes.yaml index 6115c945..4e578d05 100644 --- a/.github/workflows/code_changes.yaml +++ b/.github/workflows/code_changes.yaml @@ -20,7 +20,7 @@ jobs: with: args: ". -l 79 --check" Test: - runs-on: ubuntu-latest + runs-on: larger-runner steps: - name: Checkout repo uses: actions/checkout@v2 diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29b..dde161a8 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: minor + changes: + fixed: + - Larger GH runner for data generation. diff --git a/policyengine_us_data/datasets/cps/extended_cps.py b/policyengine_us_data/datasets/cps/extended_cps.py index dbccf0c1..c6f4ab1d 100644 --- a/policyengine_us_data/datasets/cps/extended_cps.py +++ b/policyengine_us_data/datasets/cps/extended_cps.py @@ -68,6 +68,7 @@ "casualty_loss", "unreported_payroll_tax", "recapture_of_investment_credit", + "deductible_mortgage_interest", ] if os.environ.get("TEST_LITE"): From edf7b5bf457b3e5ae1104678184a7e85e5dcdb71 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Sat, 1 Feb 2025 08:34:40 +1100 Subject: [PATCH 2/3] Add test for ECPS mortgage interest --- .../tests/test_datasets/test_enhanced_cps.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py b/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py index 41fdb1aa..32904f36 100644 --- a/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py +++ b/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py @@ -27,3 +27,12 @@ def test_policyengine_cps_loads(year: int): sim = Microsimulation(dataset=dataset) assert not sim.calculate("household_net_income").isna().any() + +def test_ecps_has_mortgage_interest(): + from policyengine_us_data.datasets.cps import EnhancedCPS_2024 + from policyengine_us import Microsimulation + + sim = Microsimulation(dataset=EnhancedCPS_2024) + + assert sim.calculate("deductible_mortgage_interest").sum() > 1 + assert sim.calculate("interest_expense").sum() > 1 From fa7269b2f4d53a7687941146d56d224619df078f Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Sat, 1 Feb 2025 08:34:47 +1100 Subject: [PATCH 3/3] Format --- policyengine_us_data/tests/test_datasets/test_enhanced_cps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py b/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py index 32904f36..64f85dcb 100644 --- a/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py +++ b/policyengine_us_data/tests/test_datasets/test_enhanced_cps.py @@ -28,6 +28,7 @@ def test_policyengine_cps_loads(year: int): assert not sim.calculate("household_net_income").isna().any() + def test_ecps_has_mortgage_interest(): from policyengine_us_data.datasets.cps import EnhancedCPS_2024 from policyengine_us import Microsimulation