taxcalc 4.3.1__py3-none-any.whl → 4.3.3__py3-none-any.whl

taxcalc/__init__.py

@@ -14,6 +14,6 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '4.3.1'
+__version__ = '4.3.3'
 __min_python3_version__ = 10
 __max_python3_version__ = 12

taxcalc/calculator.py

@@ -698,7 +698,8 @@ class Calculator():
                                   self.policy_param('FICA_ss_trt_employee') +
                                   self.policy_param('FICA_mc_trt_employer') +
                                   self.policy_param('FICA_mc_trt_employee')),
-                           0.5 * (self.policy_param('FICA_mc_trt_employer') + self.policy_param('FICA_mc_trt_employee')))
+                           0.5 * (self.policy_param('FICA_mc_trt_employer') +
+                                  self.policy_param('FICA_mc_trt_employee')))
         else:
             adj = 0.0
         # compute marginal tax rates
@@ -1189,11 +1190,10 @@ class Calculator():
                 for pname in baseline.keys():
                     upda_value = getattr(updated, pname)
                     base_value = getattr(baseline, pname)
+                    is_array = isinstance(upda_value, np.ndarray)
                     if (
-                        (isinstance(upda_value, np.ndarray) and
-                         np.allclose(upda_value, base_value)) or
-                        (not isinstance(upda_value, np.ndarray) and
-                         upda_value != base_value)
+                        (is_array and not np.allclose(upda_value, base_value))
+                        or (is_array == False and upda_value != base_value)
                     ):
                         params_with_diff.append(pname)
                 if params_with_diff:
@@ -1248,7 +1248,7 @@ class Calculator():
                         else:  # if baseline is GrowDiff object
                             # each GrowDiff parameter has zero as default value
                             doc += '  baseline_value: 0.0\n'
-            del mdata_base
+                    del mdata_base
             return doc
 
         # begin main logic of reform_documentation

taxcalc/growfactors.py

@@ -38,7 +38,7 @@ class GrowFactors():
     which is for use with puf and cps data from the taxdata repository.
     """
 
-    PACKAGE_FILE_NAMES = ['growfactors.csv', 'tmd_growfactors.csv']
+    PACKAGE_FILE_NAMES = ['growfactors.csv']
     FILE_PATH = os.path.abspath(os.path.dirname(__file__))
 
     VALID_NAMES = set(['ABOOK', 'ACGNS', 'ACPIM', 'ACPIU',

taxcalc/policy.py

@@ -7,6 +7,7 @@ Tax-Calculator federal tax policy Policy class.
 
 import os
 import json
+from pathlib import Path
 import numpy as np
 from taxcalc.parameters import Parameters
 from taxcalc.growfactors import GrowFactors
@@ -37,7 +38,7 @@ class Policy(Parameters):
     DEFAULTS_FILE_NAME = 'policy_current_law.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
     JSON_START_YEAR = 2013  # remains the same unless earlier data added
-    LAST_KNOWN_YEAR = 2024  # last year for which indexed param vals are known
+    LAST_KNOWN_YEAR = 2025  # last year for which indexed param vals are known
     # should increase LAST_KNOWN_YEAR by one every calendar year
     LAST_BUDGET_YEAR = 2034  # last extrapolation year
     # should increase LAST_BUDGET_YEAR by one every calendar year
@@ -80,7 +81,7 @@ class Policy(Parameters):
     # (3) specify which Policy parameters are wage (rather than price) indexed
     WAGE_INDEXED_PARAMS = ['SS_Earnings_c', 'SS_Earnings_thd']
 
-    def __init__(self, gfactors=None, only_reading_defaults=False, **kwargs):
+    def __init__(self, gfactors=None, **kwargs):
         # put JSON contents of DEFAULTS_FILE_NAME into self._vals dictionary
         super().__init__()
         # handle gfactors argument
@@ -92,7 +93,6 @@ class Policy(Parameters):
             raise ValueError('gfactors is not None or a GrowFactors instance')
         # read default parameters and initialize
         syr = Policy.JSON_START_YEAR
-        lyr = Policy.LAST_BUDGET_YEAR
         nyrs = Policy.DEFAULT_NUM_YEARS
         self._inflation_rates = None
         self._wage_growth_rates = None
@@ -101,6 +101,19 @@ class Policy(Parameters):
                         Policy.REDEFINED_PARAMS,
                         Policy.WAGE_INDEXED_PARAMS, **kwargs)
 
+    @staticmethod
+    def tmd_constructor(growfactors_path):  # pragma: no cover
+        """
+        Static method returns a Policy object instantiated with TMD
+        input data.  This convenience method works in a analogous way
+        to Policy(), which returns a Policy object instantiated with
+        non-TMD input data.
+        """
+        assert isinstance(growfactors_path, Path)
+        gf_filename = str(growfactors_path)
+        tmd_growfactors = GrowFactors(growfactors_filename=gf_filename)
+        return Policy(gfactors=tmd_growfactors)
+
     @staticmethod
     def read_json_reform(obj):
         """
@@ -129,7 +142,7 @@ class Policy(Parameters):
             Policy.DEFAULTS_FILE_PATH,
             Policy.DEFAULTS_FILE_NAME
         )
-        with open(path) as f:
+        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"]