Revise TMD code to use new taxcalc Policy and Records tmd_ctor

PSLmodels · Dec 15, 2024 · 849b6dd · 849b6dd
1 parent 6f3479a
commit 849b6dd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/tests/test_area_weights.py b/tests/test_area_weights.py
@@ -23,12 +23,12 @@ def test_area_xx(tests_folder):
     # compare actual vs expected results for faux area xx
     # ... instantiate Tax-Calculator object for area
     pol = tc.Policy.tmd_constructor(
-        growfactors_path=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
+        growfactors=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
     )
     rec = tc.Records.tmd_constructor(
         data_path=(STORAGE_FOLDER / "output" / "tmd.csv.gz"),
         weights_path=(AREAS_FOLDER / "weights" / "xx_tmd_weights.csv.gz"),
-        growfactors_path=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
+        growfactors=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
         exact_calculations=True,
     )
     sim = tc.Calculator(policy=pol, records=rec)

diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -38,12 +38,12 @@ def compare(name, act, exp, tol):
 
     # use national tmd files to compute various 2021 income tax statistics
     pol = tc.Policy.tmd_constructor(
-        growfactors_path=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
+        growfactors=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
     )
     rec = tc.Records.tmd_constructor(
         data_path=(STORAGE_FOLDER / "output" / "tmd.csv.gz"),
         weights_path=(STORAGE_FOLDER / "output" / "tmd_weights.csv.gz"),
-        growfactors_path=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
+        growfactors=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
         exact_calculations=True,
     )
     sim = tc.Calculator(policy=pol, records=rec)

diff --git a/tests/test_tax_revenue.py b/tests/test_tax_revenue.py
@@ -57,7 +57,7 @@ def test_tax_revenue(
         exp_ptax[year] = round(fy2cy(fy_ptax[year], fy_ptax[year + 1]), 3)
     # calculate actual tax revenues for each calendar year
     pol = tc.Policy.tmd_constructor(
-        growfactors_path=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
+        growfactors=(STORAGE_FOLDER / "output" / "tmd_growfactors.csv"),
     )
     wghts = str(tmd_weights_path)
     growf = tc.GrowFactors(growfactors_filename=str(tmd_growfactors_path))

diff --git a/tmd/create_taxcalc_cached_files.py b/tmd/create_taxcalc_cached_files.py
@@ -19,11 +19,11 @@ def create_cached_files():
     for each variable in the CACHED_TAXCALC_VARIABLES list.
     """
     # calculate all Tax-Calculator variables for TAX_YEAR
-    pol = tc.Policy.tmd_constructor(growfactors_path=GFFILE_PATH)
+    pol = tc.Policy.tmd_constructor(growfactors=GFFILE_PATH)
     rec = tc.Records.tmd_constructor(
         data_path=INFILE_PATH,
         weights_path=WTFILE_PATH,
-        growfactors_path=GFFILE_PATH,
+        growfactors=GFFILE_PATH,
         exact_calculations=True,
     )
     calc = tc.Calculator(policy=pol, records=rec)

diff --git a/tmd/utils/taxcalc_utils.py b/tmd/utils/taxcalc_utils.py
@@ -81,7 +81,7 @@ def add_taxcalc_outputs(
         weights_scale=1.0,
     )
     if isinstance(growfactors, pathlib.PosixPath):
-        policy = tc.Policy.tmd_constructor(growfactors_path=growfactors)
+        policy = tc.Policy.tmd_constructor(growfactors=growfactors)
     else:
         policy = tc.Policy()
     if reform: