taxcalc 5.1.0__py3-none-any.whl → 5.3.0__py3-none-any.whl

taxcalc/__init__.py

@@ -14,6 +14,6 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '5.1.0'
-__min_python3_version__ = 10
-__max_python3_version__ = 12
+__version__ = '5.3.0'
+__min_python3_version__ = 11
+__max_python3_version__ = 13

taxcalc/calcfunctions.py

@@ -943,8 +943,9 @@ def ItemDed(e17500, e18400, e18500, e19200,
             ID_Medical_c, ID_StateLocalTax_c, ID_RealEstate_c,
             ID_InterestPaid_c, ID_Charity_c, ID_Casualty_c,
             ID_Miscellaneous_c, ID_AllTaxes_c, ID_AllTaxes_hc,
+            ID_AllTaxes_c_ps, ID_AllTaxes_c_po_rate, ID_AllTaxes_c_po_floor,
             ID_StateLocalTax_crt, ID_RealEstate_crt, ID_Charity_f,
-            ID_reduction_salt_rate, ID_reduction_other_rate):
+            ID_reduction_rate):
     """
     Calculates itemized deductions, Form 1040, Schedule A.
 
@@ -1057,10 +1058,16 @@ def ItemDed(e17500, e18400, e18500, e19200,
         Ceiling on the amount of miscellaneous expense deduction
         allowed (dollars)
     ID_AllTaxes_c: list
-        Ceiling on the amount of state and local income, stales, and
+        Cap on the amount of state and local income, sales, and
         real estate deductions allowed (dollars)
     ID_AllTaxes_hc: float
         State and local income, sales, and real estate tax deduciton haircut
+    ID_AllTaxes_c_ps: float
+        AGI level above which ID_AllTaxes_c is reduced
+    ID_AllTaxes_c_po_rate: float
+        ID_AllTaxes_c reduction rate when AGI is above ID_AllTaxes_c_ps
+    ID_AllTaxes_c_po_floor: float
+        Floor below which ID_AllTaxes_c cannot be reduced
     ID_StateLocalTax_crt: float
         Ceiling (as decimal fraction of AGI) for the combination of all
         state and local income and sales tax deductions
@@ -1069,10 +1076,8 @@ def ItemDed(e17500, e18400, e18500, e19200,
         state, local, and foreign real estate tax deductions
     ID_Charity_f: list
         Floor on the amount of charity expense deduction allowed (dollars)
-    ID_reduction_salt_rate: float
-        OBBBA reduction rate for SALT deductions
-    ID_reduction_other_rate: float
-        OBBBA reduction rate for other deductions
+    ID_reduction_rate: float
+        OBBBA reduction rate for all itemized deductions
 
     Returns
     -------
@@ -1115,7 +1120,12 @@ def ItemDed(e17500, e18400, e18500, e19200,
     c18400 = min(c18400, ID_StateLocalTax_crt * max(c00100, 0.0001))
     c18500 = min(c18500, ID_RealEstate_crt * max(c00100, 0.0001))
     c18300 = (c18400 + c18500) * (1. - ID_AllTaxes_hc)
-    c18300 = min(c18300, ID_AllTaxes_c[MARS - 1])
+    cap = ID_AllTaxes_c[MARS - 1]
+    if posagi > ID_AllTaxes_c_ps[MARS - 1]:
+        excess_agi = posagi - ID_AllTaxes_c_ps[MARS - 1]
+        cap = max(0., cap - excess_agi * ID_AllTaxes_c_po_rate)
+        cap = max(cap, ID_AllTaxes_c_po_floor[MARS - 1])
+    c18300 = min(c18300, cap)
     # Interest paid
     c19200 = e19200 * (1. - ID_InterestPaid_hc)
     c19200 = min(c19200, ID_InterestPaid_c[MARS - 1])
@@ -1154,16 +1164,11 @@ def ItemDed(e17500, e18400, e18500, e19200,
     # OBBBA limitation on total itemized deductions
     # (no attempt to adjust c04470 components for limitation)
     reduction = 0.
-    if ID_reduction_salt_rate > 0. or ID_reduction_other_rate > 0.:
-        assert c21040 <= 0.0, "Pease and OBBBA cannot both be in effect"
+    if ID_reduction_rate > 0.:
+        assert c21040 <= 0.0, 'Pease and OBBBA cannot both be in effect'
         tincome = max(0., c00100 - c04600)
         texcess = max(0., tincome - II_brk6[MARS - 1])
-        smaller_salt = min(c18300, texcess)
-        salt_reduction = ID_reduction_salt_rate * smaller_salt
-        other_deds = max(0, c04470 - c18300)
-        smaller_other = min(other_deds, texcess)
-        other_reduction = ID_reduction_other_rate * smaller_other
-        reduction = salt_reduction + other_reduction
+        reduction = ID_reduction_rate * texcess
     c04470 = max(0., c04470 - reduction)
     # Cap total itemized deductions
     # (no attempt to adjust c04470 components for limitation)
@@ -2197,7 +2202,7 @@ def F2441(MARS, earned_p, earned_s, f2441, CDCC_c, e32800, exact, c00100,
         )
         # ... second phase-down from CDCC_po1_rate_min to CDCC_po2_rate_min
         ps2 = CDCC_ps2[MARS - 1]
-        assert ps2 >= ps1, "CDCC_ps2 must be no less than CDCC_ps1"
+        assert ps2 >= ps1, 'CDCC_ps2 must be no less than CDCC_ps1'
         if c00100 > ps2:
             steps_fractional = (c00100 - ps2) / CDCC_po2_step_size[MARS - 1]
             if exact == 1:  # exact calculation as on tax forms

taxcalc/calculator.py

@@ -282,7 +282,7 @@ class Calculator():
         """
         if param_value is None:
             val = getattr(self.__policy, param_name)
-            if param_name.startswith("_"):
+            if param_name.startswith('_'):
                 return val
             return val[0]  # drop down a dimension.
         setattr(self.__policy, param_name, param_value)
@@ -1214,11 +1214,11 @@ class Calculator():
                         # ... write optional param-vector-index line
                         if isinstance(pval, list):
                             labels = paramtools.consistent_labels(
-                                [mdata_base[pname]["value"][0]]
+                                [mdata_base[pname]['value'][0]]
                             )
                             label = None
                             for _label in labels:
-                                if _label not in ("value", "year"):
+                                if _label not in ('value', 'year'):
                                     label = _label
                                     break
                             if label:

taxcalc/cli/tc.py

@@ -96,23 +96,23 @@ def cli_tc_main():
                               '"stair-step" provisions in the tax law that '
                               'complicate marginal-tax-rate calculations.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--params',
                         help=('optional flag that causes policy parameter '
                               'values for baseline and reform to be written '
                               'to separate text files.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--tables',
                         help=('optional flag that causes distributional '
                               'tables to be written to a text file.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--graphs',
                         help=('optional flag that causes graphs to be written '
                               'to HTML files for viewing in browser.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--dumpdb',
                         help=('optional flag that causes TAXYEAR variable '
                               'values for each tax-unit under both '
@@ -121,7 +121,7 @@ def cli_tc_main():
                               'included in the database are controlled by '
                               'the --dumpvars option).'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--dumpvars',
                         help=('DUMPVARS is name of optional file containing a '
                               'space-delimited list of variables to include '
@@ -129,7 +129,9 @@ def cli_tc_main():
                               'a minimal set of variables.  Valid variable '
                               'names include all variables in the '
                               'records_variables.json file plus mtr_itax and '
-                              'mtr_ptax (MTRs wrt taxpayer earnings).'),
+                              'mtr_ptax (MTRs wrt taxpayer earnings).  If '
+                              'DUMPVARS is ALL, then all valid variable names '
+                              'are included in the dump database.'),
                         default=None)
     parser.add_argument('--runid', metavar='N',
                         help=('N is a positive integer run id that is used '
@@ -142,23 +144,23 @@ def cli_tc_main():
                         help=('optional flag that suppresses messages about '
                               'input and output actions.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--test',
                         help=('optional flag that conducts installation '
                               'test, writes test result to stdout, '
                               'and quits leaving the test-related files.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--version',
                         help=('optional flag that writes Tax-Calculator '
                               'release version to stdout and quits.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--usage',
                         help=('optional flag that writes short usage '
                               'reminder to stdout and quits.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     args = parser.parse_args()
     using_error_file = args.silent and args.runid != 0
     efilename = f'run{args.runid}.errors'
@@ -246,7 +248,9 @@ def cli_tc_main():
     # specify dumpvars_str from args.dumpvars file
     dumpvars_str = ''
     if args.dumpvars:
-        if os.path.exists(args.dumpvars):
+        if args.dumpvars == 'ALL':
+            dumpvars_str = 'ALL'
+        elif os.path.exists(args.dumpvars):
             with open(args.dumpvars, 'r', encoding='utf-8') as dfile:
                 dumpvars_str = dfile.read()
         else:

taxcalc/data.py

@@ -109,7 +109,7 @@ class Data():
                 self._read_weights(weights)
                 # ... weights must be same size as data
                 if self.array_length > len(self.WT.index):
-                    raise ValueError("Data has more records than weights.")
+                    raise ValueError('Data has more records than weights.')
                 if self.array_length < len(self.WT.index):
                     # scale-up sub-sample weights by year-specific factor
                     sum_full_weights = self.WT.sum()

taxcalc/decorators.py

@@ -39,7 +39,7 @@ def id_wrapper(*dec_args, **dec_kwargs):  # pylint: disable=unused-argument
     return wrap
 
 
-if DO_JIT is False or 'NOTAXCALCJIT' in os.environ:
+if DO_JIT is False or "NOTAXCALCJIT" in os.environ:
     JIT = id_wrapper
 else:
     JIT = numba.jit
@@ -89,7 +89,8 @@ def create_apply_function_string(sigout, sigin, parameters):
     out_args = ["x_" + str(i) for i in range(0, len(sigout))]
     in_args = ["x_" + str(i) for i in range(len(sigout), total_len)]
 
-    fstr.write(f"def ap_func({','.join(out_args + in_args)}):\n")
+    all_args = ",".join(out_args + in_args)
+    fstr.write(f"def ap_func({all_args}):\n")
     fstr.write("  for i in range(len(x_0)):\n")
     out_index = [x + "[i]" for x in out_args]
     in_index = []
@@ -194,8 +195,8 @@ def make_apply_function(func, out_args, in_args, parameters,
     eval(func_code,  # pylint: disable=eval-used
          {"jitted_f": jitted_f}, fakeglobals)
     if do_jit:
-        return JIT(**kwargs)(fakeglobals['ap_func'])
-    return fakeglobals['ap_func']
+        return JIT(**kwargs)(fakeglobals["ap_func"])
+    return fakeglobals["ap_func"]
 
 
 def apply_jit(dtype_sig_out, dtype_sig_in, parameters=None, **kwargs):
@@ -256,7 +257,7 @@ def iterate_jit(parameters=None, **kwargs):
         # Get the input arguments from the function
         in_args = inspect.getfullargspec(func).args
         # Get the numba.jit arguments
-        jit_args_list = inspect.getfullargspec(JIT).args + ['nopython']
+        jit_args_list = inspect.getfullargspec(JIT).args + ["nopython"]
         kwargs_for_jit = {}
         for key, val in kwargs.items():
             if key in jit_args_list:
@@ -280,7 +281,7 @@ def iterate_jit(parameters=None, **kwargs):
         # the AST of the function
         grn = GetReturnNode()
         all_out_args = None
-        for node in ast.walk(ast.parse(''.join(src))):
+        for node in ast.walk(ast.parse("".join(src))):
             all_out_args = grn.visit(node)
             if all_out_args:
                 break
@@ -301,7 +302,7 @@ def iterate_jit(parameters=None, **kwargs):
             in iterate_jit decorator.
             """
             # os TESTING environment only accepts string arguments
-            if os.getenv('TESTING') == 'True':
+            if os.getenv("TESTING") == "True":
                 return func(*args, **kwargs)
 
             in_arrays = []
@@ -321,7 +322,7 @@ def iterate_jit(parameters=None, **kwargs):
             fakeglobals = {}
             eval(func_code,  # pylint: disable=eval-used
                  {"applied_f": applied_jitted_f}, fakeglobals)
-            high_level_fn = fakeglobals['hl_func']
+            high_level_fn = fakeglobals["hl_func"]
             ans = high_level_fn(*args, **kwargs)
             return ans
 

taxcalc/growfactors.py

@@ -35,7 +35,8 @@ class GrowFactors():
     -----
     Typical usage is "gfactor = GrowFactors()", which produces an object
     containing baseline growth factors in the GrowFactors.FILE_NAME file,
-    which is for use with puf and cps data from the taxdata repository.
+    which is used to extrapolate cps and puf data from the taxdata repository,
+    and is used to index policy parameters.
     """
 
     PACKAGE_FILE_NAMES = ['growfactors.csv']

taxcalc/policy.py

@@ -22,8 +22,9 @@ class Policy(Parameters):
 
     Parameters
     ----------
-    gfactors: GrowFactors class instance
-        containing price inflation rates and wage growth rates
+    gfactors: GrowFactors class instance or None
+        containing price inflation rates and wage growth rates used
+        to index policy paramaters
 
     last_budget_year: integer
         user-defined last parameter extrapolation year
@@ -103,6 +104,13 @@ class Policy(Parameters):
         'ID_Charity_crt_cash': (
             'was renamed ID_Charity_crt_all in Tax-Calculator 5.1.0'
         ),
+        # following parameters were renamed in PR 2939
+        'ID_reduction_salt_rate': (
+            'was renamed ID_reduction_rate in Tax-Calculator 5.1.0'
+        ),
+        'ID_reduction_other_rate': (
+            'was renamed ID_reduction_rate in Tax-Calculator 5.1.0'
+        ),
     }
     # (2) specify which Policy parameters have been redefined recently
     #     where "recently" means in the last major release
@@ -193,15 +201,15 @@ class Policy(Parameters):
         )
         with open(path, 'r', encoding='utf-8') as f:
             defaults = json.loads(f.read())  # pylint: disable=protected-access
-        return [k for k in defaults if k != "schema"]
+        return [k for k in defaults if k != 'schema']
 
     def set_rates(self):
         """
         Initialize policy parameter indexing rates.
         """
         cpi_vals = [
-            vo["value"] for
-            vo in self._data["parameter_indexing_CPI_offset"]["value"]
+            vo['value'] for
+            vo in self._data['parameter_indexing_CPI_offset']['value']
         ]
         # parameter_indexing_CPI_offset parameter is no longer used, so check:
         assert any(cpi_vals) is False, \