Merge pull request #232 from PSLmodels/update-to-tc-430

Update setup.py to use Tax-Calculator 4.3.0 version
PSLmodels · Oct 2, 2024 · d5c6e39 · d5c6e39
2 parents 007ee4e + a8c25b9
commit d5c6e39
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
     install_requires=[
         "policyengine_us==1.55.0",
         "tables",  # required by policyengine_us
-        "taxcalc>=4.2.2",
+        "taxcalc>=4.3.0",
         "scikit-learn",
         "torch",
         "tensorboard",

diff --git a/tests/expected_tax_expenditures b/tests/expected_tax_expenditures
@@ -1,18 +1,18 @@
-YR,KIND,EST= 2023 paytax 1591.7
-YR,KIND,EST= 2023 iitax 2505.3
-YR,KIND,EST= 2023 ctc 130.1
-YR,KIND,EST= 2023 eitc 69.8
-YR,KIND,EST= 2023 social_security_partial_taxability 35.7
+YR,KIND,EST= 2023 paytax 1595.0
+YR,KIND,EST= 2023 iitax 2507.0
+YR,KIND,EST= 2023 ctc 130.2
+YR,KIND,EST= 2023 eitc 69.6
+YR,KIND,EST= 2023 social_security_partial_taxability 35.9
 YR,KIND,EST= 2023 niit -54.0
 YR,KIND,EST= 2023 cgqd_tax_preference 220.9
 YR,KIND,EST= 2023 qbid 58.0
-YR,KIND,EST= 2023 salt 21.1
-YR,KIND,EST= 2026 paytax 1847.0
-YR,KIND,EST= 2026 iitax 3140.8
+YR,KIND,EST= 2023 salt 21.2
+YR,KIND,EST= 2026 paytax 1851.4
+YR,KIND,EST= 2026 iitax 3161.2
 YR,KIND,EST= 2026 ctc 44.7
-YR,KIND,EST= 2026 eitc 78.0
-YR,KIND,EST= 2026 social_security_partial_taxability 47.6
-YR,KIND,EST= 2026 niit -52.3
-YR,KIND,EST= 2026 cgqd_tax_preference 218.4
+YR,KIND,EST= 2026 eitc 77.8
+YR,KIND,EST= 2026 social_security_partial_taxability 47.7
+YR,KIND,EST= 2026 niit -53.8
+YR,KIND,EST= 2026 cgqd_tax_preference 224.7
 YR,KIND,EST= 2026 qbid -0.0
-YR,KIND,EST= 2026 salt 164.8
+YR,KIND,EST= 2026 salt 165.4
diff --git a/tmd/areas/create_area_weights.py b/tmd/areas/create_area_weights.py
@@ -173,12 +173,10 @@ def all_taxcalc_variables(write_cache):
     if TAXCALC_AGI_CACHE.exists():
         vdf["c00100"] = np.load(TAXCALC_AGI_CACHE)
     else:
-        input_data = tc.Records(
-            data=vdf,
-            start_year=FIRST_YEAR,
-            weights=str(WTFILE_PATH),
-            gfactors=tc.GrowFactors(growfactors_filename=str(GFFILE_PATH)),
-            adjust_ratios=None,
+        input_data = tc.Records.tmd_constructor(
+            data_path=INFILE_PATH,
+            weights_path=WTFILE_PATH,
+            growfactors_path=GFFILE_PATH,
             exact_calculations=True,
         )
         sim = tc.Calculator(records=input_data, policy=tc.Policy())